dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-07 08:10:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Enable RunCMake.RuntimePath test on more platforms

Browse Source 
Move the "ELF" check to specific cases inside the test.
This commit is contained in:
Brad King
2023-12-07 14:58:40 -05:00
parent 5a61984088
commit 5f1bbdb3b3
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Tests/RunCMake/CMakeLists.txt
View File

@@ -434,8 +434,8 @@ endif()
add_RunCMake_test(ObjectLibrary) add_RunCMake_test(ObjectLibrary)
add_RunCMake_test(ParseImplicitIncludeInfo) add_RunCMake_test(ParseImplicitIncludeInfo)
add_RunCMake_test(ParseImplicitLinkInfo) add_RunCMake_test(ParseImplicitLinkInfo)
if(UNIX AND CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG AND CMAKE_EXECUTABLE_FORMAT STREQUAL "ELF") if(UNIX AND CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG)
add_RunCMake_test(RuntimePath) add_RunCMake_test(RuntimePath -DCMAKE_EXECUTABLE_FORMAT=${CMAKE_EXECUTABLE_FORMAT})
endif() endif()
add_RunCMake_test(ScriptMode) add_RunCMake_test(ScriptMode)
add_RunCMake_test(Swift -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME} add_RunCMake_test(Swift -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}

16
Tests/RunCMake/RuntimePath/RunCMakeTest.cmake
View File

@@ -21,12 +21,14 @@ if(RunCMake_GENERATOR_IS_MULTI_CONFIG)
set(cfg_dir /Debug) set(cfg_dir /Debug)
endif() endif()
run_RuntimePath(SymlinkImplicit) if(CMAKE_EXECUTABLE_FORMAT STREQUAL "ELF")
run_cmake_command(SymlinkImplicitCheck run_RuntimePath(SymlinkImplicit)
${CMAKE_COMMAND} -Ddir=${RunCMake_BINARY_DIR}/SymlinkImplicit-build -Dcfg_dir=${cfg_dir} -P ${RunCMake_SOURCE_DIR}/SymlinkImplicitCheck.cmake) run_cmake_command(SymlinkImplicitCheck
${CMAKE_COMMAND} -Ddir=${RunCMake_BINARY_DIR}/SymlinkImplicit-build -Dcfg_dir=${cfg_dir} -P ${RunCMake_SOURCE_DIR}/SymlinkImplicitCheck.cmake)
run_RuntimePath(Relative) run_RuntimePath(Relative)
run_RuntimePath(Genex) run_RuntimePath(Genex)
run_cmake_command(GenexCheck run_cmake_command(GenexCheck
${CMAKE_COMMAND} -Ddir=${RunCMake_BINARY_DIR}/Genex-build -P ${RunCMake_SOURCE_DIR}/GenexCheck.cmake) ${CMAKE_COMMAND} -Ddir=${RunCMake_BINARY_DIR}/Genex-build -P ${RunCMake_SOURCE_DIR}/GenexCheck.cmake)
endif()