diff options
Diffstat (limited to 'Tests/LoadCommandOneConfig')
-rw-r--r-- | Tests/LoadCommandOneConfig/CMakeCommands/CMakeLists.txt | 6 | ||||
-rw-r--r-- | Tests/LoadCommandOneConfig/CMakeLists.txt | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/Tests/LoadCommandOneConfig/CMakeCommands/CMakeLists.txt b/Tests/LoadCommandOneConfig/CMakeCommands/CMakeLists.txt index 2d96b04..5ee2ed0 100644 --- a/Tests/LoadCommandOneConfig/CMakeCommands/CMakeLists.txt +++ b/Tests/LoadCommandOneConfig/CMakeCommands/CMakeLists.txt @@ -3,15 +3,15 @@ project(CMAKE_LOADED_COMMANDS) if (MUDSLIDE_TYPE MATCHES MUCHO) add_definitions(-DMUCHO_MUDSLIDE) -endif (MUDSLIDE_TYPE MATCHES MUCHO) +endif () if(WATCOM) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") -endif(WATCOM) +endif() include_directories(${CMAKE_ROOT}/include ${CMAKE_ROOT}/Source) add_library(cmCMAKE_TEST_COMMAND MODULE cmTestCommand.c) if(WATCOM) target_link_libraries(cmCMAKE_TEST_COMMAND clbsdll.lib) -endif(WATCOM) +endif() diff --git a/Tests/LoadCommandOneConfig/CMakeLists.txt b/Tests/LoadCommandOneConfig/CMakeLists.txt index a443605..a75ad5a 100644 --- a/Tests/LoadCommandOneConfig/CMakeLists.txt +++ b/Tests/LoadCommandOneConfig/CMakeLists.txt @@ -26,7 +26,7 @@ include_directories(${LoadCommand_BINARY_DIR}) # try to compile the command # make sure it is not already loaded if(COMMAND CMAKE_TEST_COMMAND) -else(COMMAND CMAKE_TEST_COMMAND) +else() try_compile(COMPILE_OK ${LoadCommand_BINARY_DIR}/CMakeCommands ${LoadCommand_SOURCE_DIR}/CMakeCommands @@ -39,7 +39,7 @@ else(COMMAND CMAKE_TEST_COMMAND) ${LoadCommand_SOURCE_DIR}/CMakeCommands CMAKE_LOADED_COMMANDS CMAKE_FLAGS -DMUDSLIDE_TYPE:STRING=MUCHO OUTPUT_VARIABLE OUTPUT ) -endif(COMMAND CMAKE_TEST_COMMAND) +endif() message("Output from try compile: ${OUTPUT}") @@ -57,13 +57,13 @@ if (COMPILE_OK) "${LoadCommand_BINARY_DIR}/LoadedCommand2.cxx.in" "${LoadCommand_BINARY_DIR}/LoadedCommand3.cxx" ) - endif (COMMAND CMAKE_TEST_COMMAND) -else (COMPILE_OK) + endif () +else () message("failed to compile CMAKE_LOADED_COMMANDS") -endif (COMPILE_OK) +endif () # TEST_DEF is set by the loaded command cmTestCommand.c if (TEST_DEF AND SOME_CACHE_VARIABLE AND TEST_EXEC) add_definitions(-DCMAKE_IS_FUN) -endif (TEST_DEF AND SOME_CACHE_VARIABLE AND TEST_EXEC) +endif () |