浏览代码

ENH: only link in curl directories that exist, this will help with vs6 nmake

Bill Hoffman 17 年之前
父节点
当前提交
0f88ea3993

+ 6 - 3
Tests/Complex/Executable/CMakeLists.txt

@@ -13,9 +13,12 @@ IF(COMPLEX_TEST_CMAKELIB)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
   # prefer the new curl if it is around
   # prefer the new curl if it is around
-  LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0)
-  LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl)
-  ENDIF(CMAKE_USE_NEW_CURL)
+  IF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0)
+    LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0)
+  ENDIF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0)
+  IF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl)
+    LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl)
+  ENDIF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
 ENDIF(COMPLEX_TEST_CMAKELIB)
 ENDIF(COMPLEX_TEST_CMAKELIB)
 
 

+ 6 - 3
Tests/ComplexOneConfig/Executable/CMakeLists.txt

@@ -13,9 +13,12 @@ IF(COMPLEX_TEST_CMAKELIB)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
   # prefer the new curl if it is around
   # prefer the new curl if it is around
-  LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0)
-  LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl)
-  ENDIF(CMAKE_USE_NEW_CURL)
+  IF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0)
+    LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0)
+  ENDIF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0)
+  IF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl)
+    LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl)
+  ENDIF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
 ENDIF(COMPLEX_TEST_CMAKELIB)
 ENDIF(COMPLEX_TEST_CMAKELIB)
 
 

+ 6 - 3
Tests/ComplexRelativePaths/Executable/CMakeLists.txt

@@ -13,9 +13,12 @@ IF(COMPLEX_TEST_CMAKELIB)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
   # prefer the new curl if it is around
   # prefer the new curl if it is around
-  LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0)
-  LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl)
-  ENDIF(CMAKE_USE_NEW_CURL)
+  IF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0)
+    LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0)
+  ENDIF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0)
+  IF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl)
+    LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl)
+  ENDIF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
 ENDIF(COMPLEX_TEST_CMAKELIB)
 ENDIF(COMPLEX_TEST_CMAKELIB)