diff --git a/CMakeLists.txt b/CMakeLists.txt index 23f08931..2ea65d24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -207,16 +207,16 @@ if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT APPLE) OR string(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" compileflags) if("${CMAKE_CXX_FLAGS} ${${compileflags}}" MATCHES "-fsanitize") - set(sanitizers_enabled TRUE) + set(sanitizers_enabled TRUE) else() - set(sanitizers_enabled FALSE) + set(sanitizers_enabled FALSE) endif() # cannot enable this for clang + sanitizers - if (NOT sanitizers_enabled OR NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") - # Do not allow undefined symbols, even in non-symbolic shared libraries - set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}") - set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_MODULE_LINKER_FLAGS}") + if(NOT sanitizers_enabled OR NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") + # Do not allow undefined symbols, even in non-symbolic shared libraries + set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}") + set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_MODULE_LINKER_FLAGS}") endif() endif() diff --git a/python/tests/CMakeLists.txt b/python/tests/CMakeLists.txt index 4f8be325..c88fa02f 100644 --- a/python/tests/CMakeLists.txt +++ b/python/tests/CMakeLists.txt @@ -18,23 +18,23 @@ set(TEST_PYTHONPATH set(TEST_LIBRARYPATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) if(WIN32) - set(TEST_LIBRARY_VAR "PATH") - string(REPLACE "\\" "/" TEST_PYTHONPATH "${TEST_PYTHONPATH}") - string(REPLACE "\\" "/" TEST_LIBRARYPATH "${TEST_LIBRARYPATH}") - list(JOIN TEST_PYTHONPATH "\\;" TEST_PYTHONPATH) - list(JOIN TEST_LIBRARYPATH "\\;" TEST_LIBRARYPATH) + set(TEST_LIBRARY_VAR "PATH") + string(REPLACE "\\" "/" TEST_PYTHONPATH "${TEST_PYTHONPATH}") + string(REPLACE "\\" "/" TEST_LIBRARYPATH "${TEST_LIBRARYPATH}") + list(JOIN TEST_PYTHONPATH "\\;" TEST_PYTHONPATH) + list(JOIN TEST_LIBRARYPATH "\\;" TEST_LIBRARYPATH) else() - set(TEST_LIBRARY_VAR "LD_LIBRARY_PATH") - list(JOIN TEST_PYTHONPATH ":" TEST_PYTHONPATH) - list(JOIN TEST_LIBRARYPATH ":" TEST_LIBRARYPATH) + set(TEST_LIBRARY_VAR "LD_LIBRARY_PATH") + list(JOIN TEST_PYTHONPATH ":" TEST_PYTHONPATH) + list(JOIN TEST_LIBRARYPATH ":" TEST_LIBRARYPATH) endif() set(PYTHON_ENV_COMMON "PYTHONPATH=${TEST_PYTHONPATH};${TEST_LIBRARY_VAR}=${TEST_LIBRARYPATH}") file(GLOB TEST_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tst_*.py) foreach(test_file ${TEST_FILES}) - get_filename_component(test_name ${test_file} NAME_WE) - add_test(${test_name} ${Python3_EXECUTABLE} ${test_file}) - set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "${PYTHON_ENV_COMMON}") + get_filename_component(test_name ${test_file} NAME_WE) + add_test(${test_name} ${Python3_EXECUTABLE} ${test_file}) + set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "${PYTHON_ENV_COMMON}") endforeach()