1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30
|
Author: Pino Toscano <pino@debian.org>
Description: Disable the OpenSSL requirement
GCompris does not use OpenSSL directly, so there is no need to require or link
to it. This also avoids copying the OpenSSL, and the ICU libraries to the
GCompris installation.
Last-Update: 2019-07-05
Forwarded: no
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,7 +109,7 @@ endif()
# message(FATAL_ERROR "ECM ${ECM_VERSION} not compatible with Qt ${Qt5Core_VERSION} version for android.")
# endif()
-if((UNIX AND NOT APPLE AND NOT ANDROID) OR WIN32)
+if(FALSE)
find_package(OpenSSL REQUIRED)
endif()
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -250,7 +250,7 @@ if(BUILD_STANDALONE)
#install(DIRECTORY ${_qt_qml_path}/QtGraphicalEffects DESTINATION ${_qt_qml_destdir})
# Fix for Linux 'make package' that fails to link with libicu; also package OpenSSL libs from system
- if(UNIX AND NOT APPLE AND NOT ANDROID)
+ if(FALSE)
add_library( libicudata SHARED IMPORTED )
file(GLOB LIBICUDATA_SO "${Qt5_DIR}/../../libicudata.so.[0-9][0-9]")
if("${LIBICUDATA_SO}" STREQUAL "")
|