mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 13:20:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Update test suite to run in an Anaconda environment

Browse Source
This commit is contained in:
Robert Maynard
2020-03-30 15:54:39 -04:00
committed by Brad King
parent b2a0e8c8b2
commit d806bd2e8c
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Tests/RunCMake/GenerateExportHeader/RunCMakeTest.cmake
View File

@@ -26,4 +26,12 @@ function(run_GEH)
endforeach() endforeach()
endfunction() endfunction()
# remove these flags from the enviornment if they have been set
# so the tests run the correct env
set(env_cxx_flags $ENV{CXXFLAGS})
if(env_cxx_flags)
string(REPLACE "-fvisibility=hidden" "" env_cxx_flags "${env_cxx_flags}")
string(REPLACE "-fvisibility-inlines-hidden" "" env_cxx_flags "${env_cxx_flags}")
set(ENV{CXXFLAGS} "${env_cxx_flags}")
endif()
run_GEH() run_GEH()

7
Tests/RunCMake/install/RunCMakeTest.cmake
View File

@@ -174,6 +174,13 @@ elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
run_cmake(file-GET_RUNTIME_DEPENDENCIES-badargs1) run_cmake(file-GET_RUNTIME_DEPENDENCIES-badargs1)
run_cmake(file-GET_RUNTIME_DEPENDENCIES-badargs2) run_cmake(file-GET_RUNTIME_DEPENDENCIES-badargs2)
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
if(DEFINED ENV{LDFLAGS})
# Some setups prebake disable-new-dtags into LDFLAGS
set(new_ldflags $ENV{LDFLAGS}})
string(REPLACE "-Wl,--disable-new-dtags" "" new_ldflags "${new_ldflags}")
set(ENV{LDFLAGS} "${new_ldflags}")
endif()
if(NOT CMAKE_C_COMPILER_ID MATCHES "^XL") if(NOT CMAKE_C_COMPILER_ID MATCHES "^XL")
run_install_test(file-GET_RUNTIME_DEPENDENCIES-linux) run_install_test(file-GET_RUNTIME_DEPENDENCIES-linux)
endif() endif()