diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-10-09 08:47:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-10-10 14:09:54 (GMT) |
| commit | fbc1b75c2692d82f729359b0aeec7ad959662d54 (patch) | |
| tree | e707105b484934feca042f101824081a143ab7e3 | |
| parent | 3d0e95f64c996d3d54b387f7688f988dd843ac6a (diff) | |
| download | CMake-fbc1b75c2692d82f729359b0aeec7ad959662d54.zip CMake-fbc1b75c2692d82f729359b0aeec7ad959662d54.tar.gz CMake-fbc1b75c2692d82f729359b0aeec7ad959662d54.tar.bz2 | |
Test: Remove condition for CMake version no longer supported
| -rw-r--r-- | Tests/FindPackageModeMakefileTest/CMakeLists.txt | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/Tests/FindPackageModeMakefileTest/CMakeLists.txt b/Tests/FindPackageModeMakefileTest/CMakeLists.txt index 56fcc5d..23832da 100644 --- a/Tests/FindPackageModeMakefileTest/CMakeLists.txt +++ b/Tests/FindPackageModeMakefileTest/CMakeLists.txt @@ -20,16 +20,9 @@ if(UNIX AND "${CMAKE_GENERATOR}" MATCHES "Makefile" AND configure_file(FindFoo.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/FindFoo.cmake @ONLY) # now set up the test: - if (NOT CMAKE_VERSION VERSION_LESS 2.8.12) - file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/cmakeExecutable.mk" - CONTENT "CMAKE = \"$<TARGET_FILE:cmake>\"\n" - ) - else() - get_target_property(cmakeLocation cmake LOCATION) - file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/cmakeExecutable.mk" - "CMAKE = \"${cmakeLocation}\"\n" - ) - endif() + file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/cmakeExecutable.mk" + CONTENT "CMAKE = \"$<TARGET_FILE:cmake>\"\n" + ) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Makefile.in ${CMAKE_CURRENT_BINARY_DIR}/ConfMakefile @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/main.cpp ${CMAKE_CURRENT_BINARY_DIR}/main.cpp COPYONLY) |