diff options
-rw-r--r-- | userconfig-sthalik@Linux-GNU.cmake | 3 | ||||
-rw-r--r-- | userconfig-sthalik@Windows-Clang.cmake | 1 | ||||
-rw-r--r-- | userconfig-sthalik@Windows-GNU.cmake | 2 | ||||
-rw-r--r-- | userconfig-sthalik@Windows-MSVC.cmake | 5 |
4 files changed, 9 insertions, 2 deletions
diff --git a/userconfig-sthalik@Linux-GNU.cmake b/userconfig-sthalik@Linux-GNU.cmake index 76e59ea1..526bec51 100644 --- a/userconfig-sthalik@Linux-GNU.cmake +++ b/userconfig-sthalik@Linux-GNU.cmake @@ -26,6 +26,8 @@ if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") add_definitions(-D_GLIBCXX_USE_DEPRECATED=0 -D_GLIBCXX_USE_CXX11_ABI) add_definitions(-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC) set(OpenCV_FOUND 0) +else() + set(BUILD_SHARED_LIBS OFF) endif() add_compile_definitions("$<IF:$<CONFIG:Debug,DEBUG>,,_FORTIFY_SOURCE=3>") @@ -65,7 +67,6 @@ function(fm-userconfig-external) MAGNUM_BUILD_STATIC_UNIQUE_GLOBALS OFF ) endif() - set(BUILD_SHARED_LIBS OFF PARENT_SCOPE) endfunction() # for floormat sources only diff --git a/userconfig-sthalik@Windows-Clang.cmake b/userconfig-sthalik@Windows-Clang.cmake index 538df251..817c8352 100644 --- a/userconfig-sthalik@Windows-Clang.cmake +++ b/userconfig-sthalik@Windows-Clang.cmake @@ -13,6 +13,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") ) endif() else() + set(BUILD_SHARED_LIBS OFF) add_compile_options(-march=native -mavx2) add_compile_options(-emit-llvm) add_compile_options(-fmerge-all-constants -flto=full -fwhole-program-vtables -fforce-emit-vtables) diff --git a/userconfig-sthalik@Windows-GNU.cmake b/userconfig-sthalik@Windows-GNU.cmake index 8735e5e4..039ef418 100644 --- a/userconfig-sthalik@Windows-GNU.cmake +++ b/userconfig-sthalik@Windows-GNU.cmake @@ -22,6 +22,8 @@ if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") add_definitions(-D_GLIBCXX_ASSERTIONS) add_definitions(-D_GLIBCXX_USE_DEPRECATED=0 -D_GLIBCXX_USE_CXX11_ABI) add_definitions(-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC) +else() + set(BUILD_SHARED_LIBS OFF) endif() add_compile_definitions("$<$<CONFIG:Debug,DEBUG>:_FORTIFY_SOURCE=3>") add_compile_definitions("$<IF:$<CONFIG:Debug,DEBUG>,,_FORTIFY_SOURCE=3>") diff --git a/userconfig-sthalik@Windows-MSVC.cmake b/userconfig-sthalik@Windows-MSVC.cmake index 82178993..e2aae06c 100644 --- a/userconfig-sthalik@Windows-MSVC.cmake +++ b/userconfig-sthalik@Windows-MSVC.cmake @@ -16,7 +16,10 @@ if(NOT DEFINED OpenCV_DIR) endif() endif() -list(APPEND CMAKE_IGNORE_PATH "c:/msys64") +if(NOT CMAKE_BUILD_TYPE STREQUAL "DEBUG") + set(BUILD_SHARED_LIBS OFF) +endif() + list(APPEND CMAKE_IGNORE_PREFIX_PATH "c:/msys64") set(CMAKE_INSTALL_MESSAGE NEVER) sets(PATH CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install") |