diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | external/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | userconfig-sthalik@Windows-Clang.cmake | 10 | ||||
| -rw-r--r-- | userconfig-sthalik@Windows-GNU.cmake | 1 | ||||
| -rw-r--r-- | userconfig-sthalik@Windows-MSVC.cmake | 5 |
5 files changed, 21 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 151c548d..635b51b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -295,4 +295,8 @@ fm_install_assets() fm_run_hook(fm-userconfig-post) add_test(floormat-testsuite "${CMAKE_INSTALL_PREFIX}/bin/floormat-test") + enable_testing() +if(NOT TARGET "corrade-test") + add_custom_target(corrade-test COMMENT "CORRADE_TEST is disabled") +endif() diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 99d5fe10..863495ab 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -287,7 +287,8 @@ if(FLOORMAT_SUBMODULE-DEPENDENCIES) if(fm-external-configured) set(fm-quiet-message 1) endif() - if(MAGNUM_BUILD_TESTS OR CORRADE_BUILD_TESTS AND NOT DEFINED CORRADE_TESTSUITE_TEST_TARGET) + #if(MAGNUM_BUILD_TESTS OR CORRADE_BUILD_TESTS AND NOT DEFINED CORRADE_TESTSUITE_TEST_TARGET) + if(CORRADE_BUILD_TESTS AND NOT DEFINED CORRADE_TESTSUITE_TEST_TARGET) sets(STRING CORRADE_TESTSUITE_TEST_TARGET corrade-test) endif() if(FLOORMAT_SUBMODULE-BENCHMARK) diff --git a/userconfig-sthalik@Windows-Clang.cmake b/userconfig-sthalik@Windows-Clang.cmake index c54a79da..eab36ea0 100644 --- a/userconfig-sthalik@Windows-Clang.cmake +++ b/userconfig-sthalik@Windows-Clang.cmake @@ -59,7 +59,7 @@ function(fm-userconfig-external) -Wno-unused-but-set-variable -Wno-error=return-type ) - if(NOT CMAKE_BUILD_TYPE STREQUAL "DEBUG" OR FLOORMAT_ASAN) + if(NOT CMAKE_BUILD_TYPE STREQUAL "DEBUG") sets(BOOL FLOORMAT_SUBMODULE-SDL2 ON SDL_SHARED OFF @@ -84,6 +84,14 @@ function(fm-userconfig-external) MAGNUM_BUILD_TESTS ON ) endif() + if(FLOORMAT_ASAN) + sets(BOOL + CORRADE_BUILD_STATIC ON + CORRADE_BUILD_TESTS OFF + MAGNUM_BUILD_STATIC ON + MAGNUM_BUILD_TESTS OFF + ) + endif() endfunction() # for test_app sources only diff --git a/userconfig-sthalik@Windows-GNU.cmake b/userconfig-sthalik@Windows-GNU.cmake index 7bce1855..317840a6 100644 --- a/userconfig-sthalik@Windows-GNU.cmake +++ b/userconfig-sthalik@Windows-GNU.cmake @@ -62,6 +62,7 @@ function(fm-userconfig-external) MAGNUM_BUILD_PLUGINS_STATIC ON MAGNUM_BUILD_STATIC_UNIQUE_GLOBALS OFF ) + set(OpenCV_DIR "" CACHE STRING "" FORCE) endif() endfunction() diff --git a/userconfig-sthalik@Windows-MSVC.cmake b/userconfig-sthalik@Windows-MSVC.cmake index 87cc7184..82178993 100644 --- a/userconfig-sthalik@Windows-MSVC.cmake +++ b/userconfig-sthalik@Windows-MSVC.cmake @@ -49,6 +49,8 @@ endif() function(fm-userconfig-external) if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") sets(BOOL + CORRADE_BUILD_TESTS ON + MAGNUM_BUILD_TESTS ON SDL_STATIC OFF SDL_SHARED ON SDL_FORCE_STATIC_VCRT OFF @@ -59,10 +61,13 @@ function(fm-userconfig-external) MAGNUM_BUILD_PLUGINS_STATIC OFF ) else() + add_definitions(-DCORRADE_TARGET_AVX_FMA) sets(BOOL SDL_STATIC ON SDL_SHARED OFF SDL_FORCE_STATIC_VCRT ON + CORRADE_BUILD_TESTS OFF + MAGNUM_BUILD_TESTS OFF CORRADE_BUILD_STATIC ON CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT ON MAGNUM_BUILD_STATIC ON |