[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [krita] 3rdparty: Revert "Add openssl"
From:       Boudewijn Rempt <null () kde ! org>
Date:       2018-09-24 7:12:46
Message-ID: E1g4L30-0008K3-0R () code ! kde ! org
[Download RAW message or body]

Git commit a39e92c72b9c6ca02d8db53be1f35c3a07c98c0f by Boudewijn Rempt.
Committed on 24/09/2018 at 07:11.
Pushed by rempt into branch 'master'.

Revert "Add openssl"

This reverts commit 909940a9bfaa3a30cfb2988123e0cf1df48a80fe.

M  +0    -1    3rdparty/CMakeLists.txt
D  +0    -15   3rdparty/ext_openssl/CMakeLists.txt
M  +1    -2    3rdparty/ext_qt/CMakeLists.txt

https://commits.kde.org/krita/a39e92c72b9c6ca02d8db53be1f35c3a07c98c0f

diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index 306e8885d64..fbdf43cb714 100644
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -169,7 +169,6 @@ if (MINGW)
     add_subdirectory( ext_patch )
     add_subdirectory( ext_png2ico )
 endif ()
-add_subdirectory( ext_openssl )
 add_subdirectory( ext_iconv )
 add_subdirectory( ext_gettext )
 add_subdirectory( ext_zlib )
diff --git a/3rdparty/ext_openssl/CMakeLists.txt \
b/3rdparty/ext_openssl/CMakeLists.txt deleted file mode 100644
index b1b524f0bb0..00000000000
--- a/3rdparty/ext_openssl/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-SET(PREFIX_ext_openssl "${EXTPREFIX}" )
-ExternalProject_Add( ext_openssl
-        DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
-        URL https://www.openssl.org/source/openssl-1.1.1.tar.gz
-        URL_MD5 7079eb017429e0ffb9efb42bf80ccb21
-
-        CONFIGURE_COMMAND <SOURCE_DIR>/config --prefix=${PREFIX_ext_openssl} \
                --openssldir=${PREFIX_ext_openssl}
-        BUILD_COMMAND make
-        INSTALL_COMMAND make install
-
-        INSTALL_DIR ${PREFIX_ext_openssl}
-        CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_fftw3} \
                -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE}
-
-        UPDATE_COMMAND ""
-)
diff --git a/3rdparty/ext_qt/CMakeLists.txt b/3rdparty/ext_qt/CMakeLists.txt
index 209420b0702..562ecce2729 100644
--- a/3rdparty/ext_qt/CMakeLists.txt
+++ b/3rdparty/ext_qt/CMakeLists.txt
@@ -10,7 +10,6 @@ if (WIN32)
         -skip qtcharts -skip qtdatavis3d -skip qtgamepad -skip qtnetworkauth
         -skip qtpurchasing -skip qtremoteobjects -skip qtscxml -skip qtserialbus
         -skip qtspeech -skip qtvirtualkeyboard
-         -openssl-linked
         #
         -qt-zlib -qt-pcre -qt-libpng -qt-libjpeg
         #
@@ -192,7 +191,7 @@ else( APPLE )
         INSTALL_DIR ${EXTPREFIX_qt}
         CONFIGURE_COMMAND <SOURCE_DIR>/configure 
         -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip \
qtdoc -skip qtenginio -skip qtgraphicaleffects -skip qtlocation -skip qtsensors -skip \
                qtserialport -skip qtwayland
-            -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview \
-skip qtxmlpatterns -no-sql-sqlite -skip qtcharts -skip qtdatavis3d  -skip qtgamepad \
-skip qtnetworkauth -skip qtpurchasing -skip qtremoteobjects -skip qtscxml -skip \
qtserialbus -skip qtspeech -skip qtvirtualkeyboard -nomake examples -nomake tools \
-no-compile-examples -no-dbus -no-iconv -no-qml-debug -no-libproxy -no-system-proxies \
-no-icu -no-mtdev -system-zlib -qt-pcre -opensource -confirm-license -openssl-linked \
-prefix ${EXTPREFIX_qt} +            -skip qtwebchannel -skip qtwebengine -skip \
qtwebsockets -skip qtwebview -skip qtxmlpatterns -no-sql-sqlite -skip qtcharts -skip \
qtdatavis3d  -skip qtgamepad -skip qtnetworkauth -skip qtpurchasing -skip \
qtremoteobjects -skip qtscxml -skip qtserialbus -skip qtspeech -skip \
qtvirtualkeyboard -nomake examples -nomake tools -no-compile-examples -no-dbus \
-no-iconv -no-qml-debug -no-libproxy -no-system-proxies -no-icu -no-mtdev \
-system-zlib -qt-pcre -opensource -confirm-license  -prefix ${EXTPREFIX_qt}  \
BUILD_COMMAND ${PARALLEL_MAKE}  INSTALL_COMMAND make install
         UPDATE_COMMAND ""


[prev in list] [next in list] [prev in thread] [next in thread]