瀏覽代碼

Merge topic 'test-load_command-simplify'

e55d69cf Tests: Remove ancient workaround in LoadCommand tests

Acked-by: Kitware Robot <[email protected]>
Merge-request: !1342
Brad King 8 年之前
父節點
當前提交
b374ea86c6
共有 2 個文件被更改,包括 0 次插入14 次删除
  1. 0 7
      Tests/LoadCommand/CMakeLists.txt
  2. 0 7
      Tests/LoadCommandOneConfig/CMakeLists.txt

+ 0 - 7
Tests/LoadCommand/CMakeLists.txt

@@ -22,13 +22,6 @@ else()
     ${LoadCommand_SOURCE_DIR}/CMakeCommands
     ${LoadCommand_SOURCE_DIR}/CMakeCommands
     CMAKE_LOADED_COMMANDS CMAKE_FLAGS -DMUDSLIDE_TYPE:STRING=MUCHO
     CMAKE_LOADED_COMMANDS CMAKE_FLAGS -DMUDSLIDE_TYPE:STRING=MUCHO
     OUTPUT_VARIABLE OUTPUT )
     OUTPUT_VARIABLE OUTPUT )
-# do another TRY_COMPILE to get around make
-# problem on hp
-  try_compile(COMPILE_OK
-    ${LoadCommand_BINARY_DIR}/CMakeCommands
-    ${LoadCommand_SOURCE_DIR}/CMakeCommands
-    CMAKE_LOADED_COMMANDS CMAKE_FLAGS -DMUDSLIDE_TYPE:STRING=MUCHO
-    OUTPUT_VARIABLE OUTPUT )
 endif()
 endif()
 
 
 message("Output from try compile: ${OUTPUT}")
 message("Output from try compile: ${OUTPUT}")

+ 0 - 7
Tests/LoadCommandOneConfig/CMakeLists.txt

@@ -28,13 +28,6 @@ else()
     ${LoadCommand_SOURCE_DIR}/CMakeCommands
     ${LoadCommand_SOURCE_DIR}/CMakeCommands
     CMAKE_LOADED_COMMANDS CMAKE_FLAGS -DMUDSLIDE_TYPE:STRING=MUCHO
     CMAKE_LOADED_COMMANDS CMAKE_FLAGS -DMUDSLIDE_TYPE:STRING=MUCHO
     OUTPUT_VARIABLE OUTPUT )
     OUTPUT_VARIABLE OUTPUT )
-# do another TRY_COMPILE to get around make
-# problem on hp
-  try_compile(COMPILE_OK
-    ${LoadCommand_BINARY_DIR}/CMakeCommands
-    ${LoadCommand_SOURCE_DIR}/CMakeCommands
-    CMAKE_LOADED_COMMANDS CMAKE_FLAGS -DMUDSLIDE_TYPE:STRING=MUCHO
-    OUTPUT_VARIABLE OUTPUT )
 endif()
 endif()
 
 
 message("Output from try compile: ${OUTPUT}")
 message("Output from try compile: ${OUTPUT}")