diff options
-rw-r--r-- | editor/CMakeLists.txt | 3 | ||||
-rw-r--r-- | test/CMakeLists.txt | 4 | ||||
-rw-r--r-- | userconfig-sthalik@Windows-Clang.cmake | 8 |
3 files changed, 12 insertions, 3 deletions
diff --git a/editor/CMakeLists.txt b/editor/CMakeLists.txt index 372d9cd8..97abd54d 100644 --- a/editor/CMakeLists.txt +++ b/editor/CMakeLists.txt @@ -26,6 +26,9 @@ endif() set_property(SOURCE "events.cpp" APPEND PROPERTY INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}") add_executable(${self} dummy.cc) +if (FLOORMAT_ASAN) + set_target_properties(${self} PROPERTIES OUTPUT_NAME "floormat-editor-asan") +endif() target_link_libraries(${self} PRIVATE ${self}_o floormat-main floormat-serialize floormat-draw floormat) install(TARGETS ${self} RUNTIME DESTINATION bin) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index e835c359..3ae516bb 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -17,6 +17,10 @@ endif() add_executable(${self} dummy.cc) target_link_libraries(${self} ${self}_o floormat-serialize floormat) +if (FLOORMAT_ASAN) + set_target_properties(${self} PROPERTIES OUTPUT_NAME "floormat-test-asan") +endif() + install(TARGETS ${self} RUNTIME DESTINATION bin) set(save-dir "${CMAKE_BINARY_DIR}/test/save") diff --git a/userconfig-sthalik@Windows-Clang.cmake b/userconfig-sthalik@Windows-Clang.cmake index ebd8aa48..244ebffc 100644 --- a/userconfig-sthalik@Windows-Clang.cmake +++ b/userconfig-sthalik@Windows-Clang.cmake @@ -12,24 +12,26 @@ if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") -fcoverage-mapping ) endif() - sets(BOOL FLOORMAT_PRECOMPILED-HEADERS OFF) + #sets(BOOL FLOORMAT_PRECOMPILED-HEADERS OFF) else() 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) add_link_options(-fmerge-all-constants -flto=full -fwhole-program-vtables -fforce-emit-vtables) add_link_options(-Wl,--gc-sections -Wl,--icf=all) - sets(BOOL FLOORMAT_PRECOMPILED-HEADERS ON) + #sets(BOOL FLOORMAT_PRECOMPILED-HEADERS ON) endif() -set(CMAKE_INSTALL_MESSAGE NEVER) +sets(BOOL FLOORMAT_PRECOMPILED-HEADERS OFF) if(FLOORMAT_ASAN) add_compile_options(-fsanitize=undefined -fsanitize=address) add_link_options(-fsanitize=undefined -fsanitize=address) + sets(BOOL FLOORMAT_PRECOMPILED-HEADERS ON) endif() set(OpenCV_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../opentrack-depends/opencv/build-clang-amd64/install" CACHE PATH "" FORCE) +set(CMAKE_INSTALL_MESSAGE NEVER) sets(STRING CMAKE_C_FLAGS "" |