Browse Source

some cleanup

Ken Martin 23 years ago
parent
commit
40fd3b83dc
2 changed files with 14 additions and 14 deletions
  1. 7 7
      Tests/LoadCommand/CMakeLists.txt
  2. 7 7
      Tests/LoadCommandOneConfig/CMakeLists.txt

+ 7 - 7
Tests/LoadCommand/CMakeLists.txt

@@ -1,19 +1,19 @@
-PROJECT(LOADED_COMMANDS)
+PROJECT(LoadedCommand)
 
 # set a definition
 SET (TEST_COMMAND_TEST1 1)
 
 # try to compile the command
 TRY_COMPILE(COMPILE_OK 
-    ${LOADED_COMMANDS_SOURCE_DIR}/CMakeCommands 
-    ${LOADED_COMMANDS_BINARY_DIR}/CMakeCommands 
-    CMAKE_LOADED_COMMANDS)
+    ${LoadedCommand_BINARY_DIR}/CMakeCommands 
+    ${LoadedCommand_SOURCE_DIR}/CMakeCommands 
+    CMAKE_LOADED_COMMANDS cmCMAKE_TEST_COMMAND)
 
 # if the compile was OK, try loading the command
 IF (COMPILE_OK)
   LOAD_COMMAND(CMAKE_TEST_COMMAND 
-    ${LOADED_COMMANDS_BINARY_DIR}/CMakeCommands 
-    ${LOADED_COMMANDS_BINARY_DIR}/CMakeCommands/Debug
+    ${LoadedCommand_BINARY_DIR}/CMakeCommands 
+    ${LoadedCommand_BINARY_DIR}/CMakeCommands/Debug
     )
   # if the command loaded, execute the command
   IF (COMMAND CMAKE_TEST_COMMAND)
@@ -24,7 +24,7 @@ ELSE (COMPILE_OK)
 ENDIF (COMPILE_OK)
 
 IF (TEST_DEF)
-    ADD_DEFINITIONS(-DCMAKE_IS_FUN)
+  ADD_DEFINITIONS(-DCMAKE_IS_FUN)
 ENDIF (TEST_DEF)
 
 ADD_EXECUTABLE (LoadedCommand LoadedCommand.cxx)

+ 7 - 7
Tests/LoadCommandOneConfig/CMakeLists.txt

@@ -1,19 +1,19 @@
-PROJECT(LOADED_COMMANDS)
+PROJECT(LoadedCommand)
 
 # set a definition
 SET (TEST_COMMAND_TEST1 1)
 
 # try to compile the command
 TRY_COMPILE(COMPILE_OK 
-    ${LOADED_COMMANDS_SOURCE_DIR}/CMakeCommands 
-    ${LOADED_COMMANDS_BINARY_DIR}/CMakeCommands 
-    CMAKE_LOADED_COMMANDS)
+    ${LoadedCommand_BINARY_DIR}/CMakeCommands 
+    ${LoadedCommand_SOURCE_DIR}/CMakeCommands 
+    CMAKE_LOADED_COMMANDS cmCMAKE_TEST_COMMAND)
 
 # if the compile was OK, try loading the command
 IF (COMPILE_OK)
   LOAD_COMMAND(CMAKE_TEST_COMMAND 
-    ${LOADED_COMMANDS_BINARY_DIR}/CMakeCommands 
-    ${LOADED_COMMANDS_BINARY_DIR}/CMakeCommands/Debug
+    ${LoadedCommand_BINARY_DIR}/CMakeCommands 
+    ${LoadedCommand_BINARY_DIR}/CMakeCommands/Debug
     )
   # if the command loaded, execute the command
   IF (COMMAND CMAKE_TEST_COMMAND)
@@ -24,7 +24,7 @@ ELSE (COMPILE_OK)
 ENDIF (COMPILE_OK)
 
 IF (TEST_DEF)
-    ADD_DEFINITIONS(-DCMAKE_IS_FUN)
+  ADD_DEFINITIONS(-DCMAKE_IS_FUN)
 ENDIF (TEST_DEF)
 
 ADD_EXECUTABLE (LoadedCommand LoadedCommand.cxx)