aboutsummaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorclick <none@none>2010-08-08 03:33:21 +0200
committerclick <none@none>2010-08-08 03:33:21 +0200
commit9a8342abb76e15a194d40be7d568ba9442ac7214 (patch)
treec723764074ae8e20d3da065acc1c2298f4aae820 /cmake
parent8082363fc10419f61dba85e4668b8401bb0cc28f (diff)
Buildsystem: Make core buildable under Windows again
- changed OpenSSL detection of headers around slightly - changed paths to MySQL-headers on Windows in a few files - removed precompiled header for scripts being built when building game - added requirement of building revision.h to be built before building shared - added some generic buildfixes (thanks zor) - use resource-files, allowing for icons to show up on windows --HG-- branch : trunk
Diffstat (limited to 'cmake')
-rw-r--r--cmake/FindOpenSSL.cmake6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/FindOpenSSL.cmake b/cmake/FindOpenSSL.cmake
index 29a4656032a..01f7d20e5d2 100644
--- a/cmake/FindOpenSSL.cmake
+++ b/cmake/FindOpenSSL.cmake
@@ -12,7 +12,7 @@
set(OPENSSL_FOUND 0)
- if(WIN32)
+ if( MSVC )
if(PLATFORM MATCHES X64)
set(TMP_OPENSSL_INCLUDE_DIR
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;InstallLocation]/include"
@@ -38,12 +38,12 @@
NAMES
openssl/ssl.h
PATHS
+ ${TMP_OPENSSL_INCLUDE_DIR}
/usr/include
/usr/include/openssl
/usr/local/include
/usr/local/include/openssl
/usr/local/openssl/include
- ${TMP_OPENSSL_INCLUDE_DIR}
DOC
"Specify the directory containing openssl.h."
)
@@ -53,12 +53,12 @@
ssleay32
ssl
PATHS
+ ${TMP_OPENSSL_LIBRARIES}
/usr/lib
/usr/lib/ssl
/usr/local/lib
/usr/local/lib/ssl
/usr/local/ssl/lib
- ${TMP_OPENSSL_LIBRARIES}
DOC "Specify the OpenSSL library here."
)