diff options
| author | Matthew Woehlke <matthew.woehlke@kitware.com> | 2022-09-14 20:01:19 (GMT) |
|---|---|---|
| committer | Matthew Woehlke <matthew.woehlke@kitware.com> | 2022-09-14 20:01:19 (GMT) |
| commit | 4ecbf1f938cf1ed4efc2032fe07e8016993d4122 (patch) | |
| tree | 19213c5e3313fc5f30176c9761e3b0e729692cd1 /Tests/RunCMake | |
| parent | c3e68020d61ae306261b4f953947483a960edf32 (diff) | |
| download | CMake-4ecbf1f938cf1ed4efc2032fe07e8016993d4122.zip CMake-4ecbf1f938cf1ed4efc2032fe07e8016993d4122.tar.gz CMake-4ecbf1f938cf1ed4efc2032fe07e8016993d4122.tar.bz2 | |
Tests: Fix recently added tests
Fix the tests added by commit 0c141b03 (try_compile: Record output
location instead of reverse computing it, 2022-08-31), which were added
as old-and-new-signature tests but only used the old signature.
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/try_compile/BuildType.cmake | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/try_compile/BuildTypeAsFlag.cmake | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/try_compile/OutputDirAsFlag.cmake | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/Tests/RunCMake/try_compile/BuildType.cmake b/Tests/RunCMake/try_compile/BuildType.cmake index f2709f8..8d7e3be 100644 --- a/Tests/RunCMake/try_compile/BuildType.cmake +++ b/Tests/RunCMake/try_compile/BuildType.cmake @@ -1,6 +1,8 @@ enable_language(C) set(CMAKE_BUILD_TYPE RelWithDebInfo) -try_compile(RESULT ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src.c +include(${CMAKE_CURRENT_SOURCE_DIR}/${try_compile_DEFS}) +try_compile(RESULT + ${try_compile_bindir_or_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/src.c COPY_FILE "${CMAKE_CURRENT_BINARY_DIR}/out.bin" ) diff --git a/Tests/RunCMake/try_compile/BuildTypeAsFlag.cmake b/Tests/RunCMake/try_compile/BuildTypeAsFlag.cmake index e9384c7..a822156 100644 --- a/Tests/RunCMake/try_compile/BuildTypeAsFlag.cmake +++ b/Tests/RunCMake/try_compile/BuildTypeAsFlag.cmake @@ -1,7 +1,9 @@ enable_language(C) set(CMAKE_BUILD_TYPE RelWithDebInfo) -try_compile(RESULT ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src.c +include(${CMAKE_CURRENT_SOURCE_DIR}/${try_compile_DEFS}) +try_compile(RESULT + ${try_compile_bindir_or_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/src.c COPY_FILE "${CMAKE_CURRENT_BINARY_DIR}/out.bin" CMAKE_FLAGS "-DCMAKE_BUILD_TYPE=Release" ) diff --git a/Tests/RunCMake/try_compile/OutputDirAsFlag.cmake b/Tests/RunCMake/try_compile/OutputDirAsFlag.cmake index 5c4dca5..1214bbb 100644 --- a/Tests/RunCMake/try_compile/OutputDirAsFlag.cmake +++ b/Tests/RunCMake/try_compile/OutputDirAsFlag.cmake @@ -1,7 +1,9 @@ enable_language(C) set(CMAKE_BUILD_TYPE RelWithDebInfo) -try_compile(RESULT ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src.c +include(${CMAKE_CURRENT_SOURCE_DIR}/${try_compile_DEFS}) +try_compile(RESULT + ${try_compile_bindir_or_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/src.c COPY_FILE "${CMAKE_CURRENT_BINARY_DIR}/out.bin" CMAKE_FLAGS "-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=bin" ) |