Skip to content

Mc cad mcx free cad #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
liuzhulu wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Mc cad mcx free cad #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2c896f
add conial supporting
liuzhulu Apr 17, 2023
5d522e6
change .gitignore
liuzhulu Apr 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,8 @@ CMakeLists.txt.user*
# exclude develop specific files
input_file
/latex/*
2
runLog.txt
2git
runLog.txt
.vs/
.vscode/
build/
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set (McCAD_VERSION_MINOR 0)
set (McCAD_VERSION ${McCAD_VERSION_MAJOR}.${McCAD_VERSION_MINOR})

# CMake
cmake_minimum_required(VERSION 3.22.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
enable_language(CXX)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED True)
Expand Down
24 changes: 12 additions & 12 deletions CMakeSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"configurations": [
{
"name": "McCAD_T1",
"generator": "Visual Studio 17 2022 Win64",
"configurationType": "Release",
"inheritEnvironments": [ "msvc_x64_x64" ],
"buildRoot": "${projectDir}\\build",
"installRoot": "${projectDir}\\build",
"cmakeCommandArgs": "-DBUILD_RPATH=true -DBUILD_STATIC=true -DBUILD_STATIC_EXE=true -DBOOST_CUSTOM_ROOT=\"D:\\inst\\boost_1_78_0\" -DOCC_CUSTOM_ROOT=\"C:\\OpenCASCADE-7.5.0-vc14-64\\opencascade-7.5.0\"",
"ctestCommandArgs": "",
}
]
"configurations": [
{
"name": "McCAD_T1",
"generator": "Visual Studio 16 2019 Win64",
"configurationType": "Release",
"inheritEnvironments": [ "msvc_x64_x64" ],
"buildRoot": "${projectDir}\\build",
"installRoot": "${projectDir}\\build",
"cmakeCommandArgs": "-DLINUX_OS=false -DBUILD_RPATH=true -DBUILD_STATIC=true -DBUILD_STATIC_EXE=true -DBOOST_CUSTOM_ROOT=\"C:\\boost_1_78_0\" -DOCC_CUSTOM_ROOT=\"C:\\OpenCASCADE-7.5.0-vc14-64\\opencascade-7.5.0\"",
"ctestCommandArgs": ""
}
]
}
Loading