Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
8dbb2d8e
Commit
8dbb2d8e
authored
Oct 14, 2014
by
Gavin Bisesi
Browse files
Merge pull request #364 from ctrlaltca/win32_openssl_cmake
Deploy openssl libraries under win32
parents
592bb7c8
ea622a73
Changes
4
Show whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
8dbb2d8e
...
@@ -158,6 +158,11 @@ set(CMAKE_AUTOMOC TRUE)
...
@@ -158,6 +158,11 @@ set(CMAKE_AUTOMOC TRUE)
# Find other needed libraries
# Find other needed libraries
FIND_PACKAGE
(
Protobuf REQUIRED
)
FIND_PACKAGE
(
Protobuf REQUIRED
)
#Find OpenSSL
IF
(
WIN32
)
FIND_PACKAGE
(
Win32SslRuntime
)
ENDIF
()
# Package builder
# Package builder
set
(
CPACK_PACKAGE_CONTACT
"Daenyth+github@gmail.com"
)
set
(
CPACK_PACKAGE_CONTACT
"Daenyth+github@gmail.com"
)
set
(
CPACK_PACKAGE_DESCRIPTION_SUMMARY
${
PROJECT_NAME
}
)
set
(
CPACK_PACKAGE_DESCRIPTION_SUMMARY
${
PROJECT_NAME
}
)
...
...
cmake/FindWin32SslRuntime.cmake
0 → 100644
View file @
8dbb2d8e
# Find the OpenSSL runtime libraries (.dll) for Windows that
# will be needed by Qt in order to access https urls.
if
(
WIN32
)
# Get standard installation paths for OpenSSL under Windows
# http://www.slproweb.com/products/Win32OpenSSL.html
set
(
_OPENSSL_ROOT_HINTS
${
OPENSSL_ROOT_DIR
}
"[HKEY_LOCAL_MACHINE
\\
SOFTWARE
\\
Microsoft
\\
Windows
\\
CurrentVersion
\\
Uninstall
\\
OpenSSL (32-bit)_is1;Inno Setup: App Path]"
"[HKEY_LOCAL_MACHINE
\\
SOFTWARE
\\
Microsoft
\\
Windows
\\
CurrentVersion
\\
Uninstall
\\
OpenSSL (64-bit)_is1;Inno Setup: App Path]"
ENV OPENSSL_ROOT_DIR
)
file
(
TO_CMAKE_PATH
"$ENV{PROGRAMFILES}"
_programfiles
)
set
(
_OPENSSL_ROOT_PATHS
"
${
_programfiles
}
/OpenSSL"
"
${
_programfiles
}
/OpenSSL-Win32"
"
${
_programfiles
}
/OpenSSL-Win64"
"C:/OpenSSL/"
"C:/OpenSSL-Win32/"
"C:/OpenSSL-Win64/"
)
unset
(
_programfiles
)
else
()
set
(
_OPENSSL_ROOT_HINTS
${
OPENSSL_ROOT_DIR
}
ENV OPENSSL_ROOT_DIR
)
endif
()
set
(
_OPENSSL_ROOT_HINTS_AND_PATHS
HINTS
${
_OPENSSL_ROOT_HINTS
}
PATHS
${
_OPENSSL_ROOT_PATHS
}
)
FIND_FILE
(
WIN32SSLRUNTIME_LIBEAY NAMES libeay32.dll
${
_OPENSSL_ROOT_HINTS_AND_PATHS
}
)
FIND_FILE
(
WIN32SSLRUNTIME_SSLEAY NAMES ssleay32.dll
${
_OPENSSL_ROOT_HINTS_AND_PATHS
}
)
IF
(
WIN32SSLRUNTIME_LIBEAY AND WIN32SSLRUNTIME_SSLEAY
)
SET
(
WIN32SSLRUNTIME_LIBRARIES
"
${
WIN32SSLRUNTIME_LIBEAY
}
"
"
${
WIN32SSLRUNTIME_SSLEAY
}
"
)
SET
(
WIN32SSLRUNTIME_FOUND
"YES"
)
message
(
STATUS
"Found OpenSSL
${
WIN32SSLRUNTIME_LIBRARIES
}
"
)
ELSE
()
SET
(
WIN32SSLRUNTIME_FOUND
"NO"
)
message
(
WARNING
"Could not find OpenSSL runtime libraries. They are not required for compiling, but needs to be available at runtime."
)
ENDIF
()
MARK_AS_ADVANCED
(
WIN32SSLRUNTIME_LIBEAY
WIN32SSLRUNTIME_SSLEAY
)
cmake/NSIS.template.in
View file @
8dbb2d8e
...
@@ -81,6 +81,8 @@ Section Uninstall
...
@@ -81,6 +81,8 @@ Section Uninstall
Delete "$INSTDIR\libprotobuf.lib"
Delete "$INSTDIR\libprotobuf.lib"
Delete "$INSTDIR\Qt*.dll"
Delete "$INSTDIR\Qt*.dll"
Delete "$INSTDIR\icu*.dll"
Delete "$INSTDIR\icu*.dll"
Delete "$INSTDIR\libeay32.dll"
Delete "$INSTDIR\ssleay32.dll"
Delete "$INSTDIR\qt.conf"
Delete "$INSTDIR\qt.conf"
Delete "$INSTDIR\qdebug.txt"
Delete "$INSTDIR\qdebug.txt"
Delete "$INSTDIR\servatrice.sql"
Delete "$INSTDIR\servatrice.sql"
...
...
cockatrice/CMakeLists.txt
View file @
8dbb2d8e
...
@@ -321,4 +321,8 @@ Data = Resources\")
...
@@ -321,4 +321,8 @@ Data = Resources\")
include(BundleUtilities)
include(BundleUtilities)
fixup_bundle(
\"\$
{CMAKE_INSTALL_PREFIX}/cockatrice.exe
\"
\"\$
{QTPLUGINS}
\"
\"
${
QT_LIBRARY_DIR
}
\"
)
fixup_bundle(
\"\$
{CMAKE_INSTALL_PREFIX}/cockatrice.exe
\"
\"\$
{QTPLUGINS}
\"
\"
${
QT_LIBRARY_DIR
}
\"
)
"
COMPONENT Runtime
)
"
COMPONENT Runtime
)
if
(
WIN32SSLRUNTIME_FOUND
)
install
(
FILES
${
WIN32SSLRUNTIME_LIBRARIES
}
DESTINATION ./
)
endif
()
endif
()
endif
()
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment