Skip to content

Alb/cmake opts1 #17

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
alberto743 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Alb/cmake opts1 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
409d5a0
CMake requirement should be at the beginning
alberto743 Apr 4, 2024
0895388
set configured file in build directory and not in install directory
alberto743 Apr 4, 2024
0880e53
When statically link, do not pass fPIC
alberto743 Apr 4, 2024
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
9 changes: 5 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)

# Project
project(McCAD)
set (McCAD_VERSION_MAJOR 1)
set (McCAD_VERSION_MINOR 1)
set (McCAD_VERSION ${McCAD_VERSION_MAJOR}.${McCAD_VERSION_MINOR})

# CMake
cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR)
enable_language(CXX)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED True)
Expand Down Expand Up @@ -36,8 +37,8 @@ add_subdirectory(src)

# Make config file
message("")
configure_file (${PROJECT_SOURCE_DIR}/src/info/info.hpp.in ${INSTALL_DIR}/src/info/info.hpp)
configure_file (${PROJECT_SOURCE_DIR}/cmake/McCADConfig.cmake.in ${INSTALL_DIR}/McCADConfig.cmake)
install(FILES ${INSTALL_DIR}/McCADConfig.cmake DESTINATION ${INSTALL_LIB_DIR})
configure_file (${PROJECT_SOURCE_DIR}/src/info/info.hpp.in ${CMAKE_BINARY_DIR}/src/info/info.hpp)
configure_file (${PROJECT_SOURCE_DIR}/cmake/McCADConfig.cmake.in ${CMAKE_BINARY_DIR}/McCADConfig.cmake)
install(FILES ${CMAKE_BINARY_DIR}/McCADConfig.cmake DESTINATION ${INSTALL_LIB_DIR})
install(EXPORT McCADTargets DESTINATION ${INSTALL_LIB_DIR})
message("")
6 changes: 3 additions & 3 deletions CMakeSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
{
"name": "McCAD",
"generator": "Visual Studio 17 2022 Win64",
"configurationType": "Release",
"configurationType": "RelWithDebInfo",
"inheritEnvironments": [ "msvc_x64_x64" ],
"buildRoot": "${projectDir}\\build",
"installRoot": "${projectDir}\\build",
"installRoot": "${projectDir}\\build\\install",
"cmakeCommandArgs": "-DBUILD_RPATH=true -DBUILD_STATIC=true -DBUILD_STATIC_EXE=true -DBOOST_CUSTOM_ROOT=\"D:\\Installs\\boost_1_81_0\" -DOCC_CUSTOM_ROOT=\"D:\\Installs\\OpenCASCADE-7.7.0-vc14-64\\opencascade-7.7.0\"",
"ctestCommandArgs": ""
}
]
}
}
1 change: 0 additions & 1 deletion cmake/McCAD_build.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ macro (McCAD_CMake_flags)
set(CMAKE_EXE_LINK_DYNAMIC_C_FLAGS)
set(CMAKE_EXE_LINK_DYNAMIC_CXX_FLAGS)
set(CMAKE_EXE_LINK_DYNAMIC_Fortran_FLAGS)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
elseif (BUILD_SHARED_EXE)
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_LIBRARY_SUFFIX})
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -shared")
Expand Down