mojotrollz/mojo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed cmake finddirectx & findopenssl

Browse Source
This commit is contained in:
Ulf Gebhardt 2017-07-27 13:51:26 +02:00
parent 8b9d3e410f
commit 3fbf3fd962
2 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmake/FindDirectX.cmake
View File

@ -3,6 +3,7 @@
if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
find_path (DirectX_ROOT_DIR find_path (DirectX_ROOT_DIR
Include/d3d9.h Include/d3d9.h
set(_PF86 "ProgramFiles(x86)")
PATHS PATHS
"$ENV{DXSDK_DIR}" "$ENV{DXSDK_DIR}"
"$ENV{ProgramFiles}/Microsoft DirectX SDK (June 2010)" "$ENV{ProgramFiles}/Microsoft DirectX SDK (June 2010)"
@ -14,15 +15,15 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
"$ENV{ProgramFiles}/Microsoft DirectX SDK (November 2007)" "$ENV{ProgramFiles}/Microsoft DirectX SDK (November 2007)"
"$ENV{ProgramFiles}/Microsoft DirectX SDK (August 2007)" "$ENV{ProgramFiles}/Microsoft DirectX SDK (August 2007)"
"$ENV{ProgramFiles}/Microsoft DirectX SDK" "$ENV{ProgramFiles}/Microsoft DirectX SDK"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (June 2010)" "$ENV{${_PF86}}/Microsoft DirectX SDK (June 2010)"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (February 2010)" "$ENV{${_PF86}}/Microsoft DirectX SDK (February 2010)"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (March 2009)" "$ENV{${_PF86}}/Microsoft DirectX SDK (March 2009)"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (August 2008)" "$ENV{${_PF86}}/Microsoft DirectX SDK (August 2008)"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (June 2008)" "$ENV{${_PF86}}/Microsoft DirectX SDK (June 2008)"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (March 2008)" "$ENV{${_PF86}}/Microsoft DirectX SDK (March 2008)"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (November 2007)" "$ENV{${_PF86}}/Microsoft DirectX SDK (November 2007)"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (August 2007)" "$ENV{${_PF86}}/Microsoft DirectX SDK (August 2007)"
"$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK" "$ENV{${_PF86}}/Microsoft DirectX SDK"
DOC "DirectX SDK root directory") DOC "DirectX SDK root directory")

23
cmake/FindOpenSSL.cmake
View File

@ -17,24 +17,11 @@ else( OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES )
set(OPENSSL_FOUND 0) set(OPENSSL_FOUND 0)
if(WIN32) if(WIN32)
set(TMP_OPENSSL_INCLUDE_DIR "./src/dep/include/openssl")
if(PLATFORM MATCHES X64) if(PLATFORM MATCHES X64)
set(TMP_OPENSSL_INCLUDE_DIR set(TMP_OPENSSL_LIBRARIES "./src/dep/lib/static/x64")
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;InstallLocation]/include/openssl"
)
set(TMP_OPENSSL_LIBRARIES
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;InstallLocation]/lib"
)
else() else()
set(TMP_OPENSSL_INCLUDE_DIR set(TMP_OPENSSL_LIBRARIES "./src/dep/lib/static")
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/include/openssl"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/include/openssl"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/include/openssl"
)
set(TMP_OPENSSL_LIBRARIES
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/lib"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/lib"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;InstallLocation]/lib"
)
endif() endif()
endif() endif()
@ -54,8 +41,7 @@ else( OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES )
find_library(OPENSSL_LIBRARIES find_library(OPENSSL_LIBRARIES
NAMES NAMES
ssleay32 libcrypto
ssl
PATHS PATHS
/usr/lib /usr/lib
/usr/lib/ssl /usr/lib/ssl
@ -70,6 +56,7 @@ else( OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES )
find_library(OPENSSL_EXTRA_LIBRARIES find_library(OPENSSL_EXTRA_LIBRARIES
NAMES NAMES
libeay32 libeay32
libcrypto
PATHS PATHS
${TMP_OPENSSL_LIBRARIES} ${TMP_OPENSSL_LIBRARIES}
DOC DOC