ENH: make it work if new curl is on

Tests/Complex/Executable/CMakeLists.txt

@@ -12,10 +12,9 @@ IF(COMPLEX_TEST_CMAKELIB)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
-  IF(CMAKE_USE_NEW_CURL)
-    LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0)
-  ELSE(CMAKE_USE_NEW_CURL)
-    LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl)
+  # 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)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
 ENDIF(COMPLEX_TEST_CMAKELIB)

Tests/ComplexOneConfig/Executable/CMakeLists.txt

@@ -12,10 +12,9 @@ IF(COMPLEX_TEST_CMAKELIB)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
-  IF(CMAKE_USE_NEW_CURL)
-    LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0)
-  ELSE(CMAKE_USE_NEW_CURL)
-    LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl)
+  # 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)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
 ENDIF(COMPLEX_TEST_CMAKELIB)

Tests/ComplexRelativePaths/Executable/CMakeLists.txt

@@ -12,10 +12,9 @@ IF(COMPLEX_TEST_CMAKELIB)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
-  IF(CMAKE_USE_NEW_CURL)
-    LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0)
-  ELSE(CMAKE_USE_NEW_CURL)
-    LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl)
+  # 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)
   LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
 ENDIF(COMPLEX_TEST_CMAKELIB)