diff options
| -rw-r--r-- | Modules/FindOpenSSL.cmake | 12 | ||||
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 | ||||
| -rw-r--r-- | Source/QtDialog/CMakeSetup.cxx | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index 7ddd783..034b0e6 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -142,15 +142,15 @@ if(WIN32 AND NOT CYGWIN) if(OPENSSL_USE_STATIC_LIBS) set(_OPENSSL_PATH_SUFFIXES - "lib" - "VC/static" "lib/VC/static" + "VC/static" + "lib" ) else() set(_OPENSSL_PATH_SUFFIXES - "lib" - "VC" "lib/VC" + "VC" + "lib" ) endif () @@ -227,8 +227,8 @@ if(WIN32 AND NOT CYGWIN) NAMES_PER_DIR ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES - "lib" "lib/MinGW" + "lib" ) find_library(SSL_EAY @@ -237,8 +237,8 @@ if(WIN32 AND NOT CYGWIN) NAMES_PER_DIR ${_OPENSSL_ROOT_HINTS_AND_PATHS} PATH_SUFFIXES - "lib" "lib/MinGW" + "lib" ) mark_as_advanced(SSL_EAY LIB_EAY) diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 68c9a6d..27ca0ca 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 6) -set(CMake_VERSION_PATCH 20160922) +set(CMake_VERSION_PATCH 20160923) #set(CMake_VERSION_RC 1) diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx index 4de4bef..52809b0 100644 --- a/Source/QtDialog/CMakeSetup.cxx +++ b/Source/QtDialog/CMakeSetup.cxx @@ -109,11 +109,13 @@ int main(int argc, char** argv) QTextCodec::setCodecForLocale(utf8_codec); #endif +#if QT_VERSION < 0x050000 // clean out standard Qt paths for plugins, which we don't use anyway // when creating Mac bundles, it potentially causes problems foreach (QString p, QApplication::libraryPaths()) { QApplication::removeLibraryPath(p); } +#endif // tell the cmake library where cmake is QDir cmExecDir(QApplication::applicationDirPath()); |