Browse Source

FindOpenSSL: De-duplicate find_library path suffixes on Windows

Store the path suffixes in a variable and reference it in each
find_library call.
Thijs Wenker 10 years ago
parent
commit
fbcbf7f29d
1 changed files with 11 additions and 12 deletions
  1. 11 12
      Modules/FindOpenSSL.cmake

+ 11 - 12
Modules/FindOpenSSL.cmake

@@ -99,15 +99,20 @@ if(WIN32 AND NOT CYGWIN)
     # We are using the libraries located in the VC subdir instead of the parent directory eventhough :
     # libeay32MD.lib is identical to ../libeay32.lib, and
     # ssleay32MD.lib is identical to ../ssleay32.lib
+
+    set(_OPENSSL_PATH_SUFFIXES
+      "lib"
+      "VC"
+      "lib/VC"
+      )
+
     find_library(LIB_EAY_DEBUG
       NAMES
         libeay32MDd
         libeay32d
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
-        "lib"
-        "VC"
-        "lib/VC"
+        ${_OPENSSL_PATH_SUFFIXES}
     )
 
     find_library(LIB_EAY_RELEASE
@@ -116,9 +121,7 @@ if(WIN32 AND NOT CYGWIN)
         libeay32
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
-        "lib"
-        "VC"
-        "lib/VC"
+        ${_OPENSSL_PATH_SUFFIXES}
     )
 
     find_library(SSL_EAY_DEBUG
@@ -127,9 +130,7 @@ if(WIN32 AND NOT CYGWIN)
         ssleay32d
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
-        "lib"
-        "VC"
-        "lib/VC"
+        ${_OPENSSL_PATH_SUFFIXES}
     )
 
     find_library(SSL_EAY_RELEASE
@@ -139,9 +140,7 @@ if(WIN32 AND NOT CYGWIN)
         ssl
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
-        "lib"
-        "VC"
-        "lib/VC"
+        ${_OPENSSL_PATH_SUFFIXES}
     )
 
     set(LIB_EAY_LIBRARY_DEBUG "${LIB_EAY_DEBUG}")