소스 검색

ENH: add a double try compile to fix crazy make on hp

Bill Hoffman 22 년 전
부모
커밋
a41e31b536
2개의 변경된 파일14개의 추가작업 그리고 0개의 파일을 삭제
  1. 7 0
      Tests/LoadCommand/CMakeLists.txt
  2. 7 0
      Tests/LoadCommandOneConfig/CMakeLists.txt

+ 7 - 0
Tests/LoadCommand/CMakeLists.txt

@@ -30,6 +30,13 @@ ELSE(COMMAND CMAKE_TEST_COMMAND)
     ${LoadedCommand_SOURCE_DIR}/CMakeCommands 
     CMAKE_LOADED_COMMANDS CMAKE_FLAGS -DMUDSLIDE_TYPE:STRING=MUCHO
     OUTPUT_VARIABLE OUTPUT )
+# do another TRY_COMPILE to get around make
+# problem on hp
+  TRY_COMPILE(COMPILE_OK 
+    ${LoadedCommand_BINARY_DIR}/CMakeCommands 
+    ${LoadedCommand_SOURCE_DIR}/CMakeCommands 
+    CMAKE_LOADED_COMMANDS CMAKE_FLAGS -DMUDSLIDE_TYPE:STRING=MUCHO
+    OUTPUT_VARIABLE OUTPUT )
 ENDIF(COMMAND CMAKE_TEST_COMMAND)
 
 MESSAGE("Output from try compile: ${OUTPUT}")

+ 7 - 0
Tests/LoadCommandOneConfig/CMakeLists.txt

@@ -30,6 +30,13 @@ ELSE(COMMAND CMAKE_TEST_COMMAND)
     ${LoadedCommand_SOURCE_DIR}/CMakeCommands 
     CMAKE_LOADED_COMMANDS CMAKE_FLAGS -DMUDSLIDE_TYPE:STRING=MUCHO
     OUTPUT_VARIABLE OUTPUT )
+# do another TRY_COMPILE to get around make
+# problem on hp
+  TRY_COMPILE(COMPILE_OK 
+    ${LoadedCommand_BINARY_DIR}/CMakeCommands 
+    ${LoadedCommand_SOURCE_DIR}/CMakeCommands 
+    CMAKE_LOADED_COMMANDS CMAKE_FLAGS -DMUDSLIDE_TYPE:STRING=MUCHO
+    OUTPUT_VARIABLE OUTPUT )
 ENDIF(COMMAND CMAKE_TEST_COMMAND)
 
 MESSAGE("Output from try compile: ${OUTPUT}")