Some cleaning up.

opencor · May 23, 2017 · 43d8efd · 43d8efd
2 parents d0c4322 + fab1e28
commit 43d8efd
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 47 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -196,7 +196,7 @@ UPDATE_LANGUAGE_FILES(${CMAKE_PROJECT_NAME} ${SOURCES} ${HEADERS_MOC} ${UIS})
 # Third-party library that must be directly embedded in the GUI version of
 # OpenCOR
 
-INCLUDE(src/3rdparty/QtSingleApplication/QtSingleApplication.cmake)
+INCLUDE(${CMAKE_SOURCE_DIR}/src/3rdparty/QtSingleApplication/QtSingleApplication.cmake)
 
 # Set the application icon, but only for Windows and macOS, since in the case of
 # Linux, it's done through the use of app_icon (see res/ui.qrc) when we register
@@ -300,8 +300,11 @@ IF(ENABLE_TESTS)
 ENDIF()
 
 # Build the OpenCOR plugins
-# Note: the build order must be such that plugins needed by others are built
-#       first...
+# Note #1: the build order must be such that plugins needed by others are built
+#          first...
+# Note #2: rely on the ExternalProject module to build our packages...
+
+INCLUDE(ExternalProject)
 
 IF(ENABLE_SAMPLE_PLUGINS)
     SET(SAMPLE_PLUGINS

diff --git a/src/plugins/support/PMRSupport/CMakeLists.txt b/src/plugins/support/PMRSupport/CMakeLists.txt
@@ -40,7 +40,7 @@ ADD_PLUGIN(PMRSupport
         ${LIBGIT2_PLUGIN}
         ${OAUTH_PLUGIN}
         WebViewerWidget
-        ${ZLIB_PLUGIN}
+        zlib
     PLUGIN_BINARIES
         ${LIBGIT2_PLUGIN_BINARY}
         ${OAUTH_PLUGIN_BINARY}

diff --git a/src/plugins/support/ZIPSupport/CMakeLists.txt b/src/plugins/support/ZIPSupport/CMakeLists.txt
@@ -14,7 +14,7 @@ ADD_PLUGIN(ZIPSupport
         src
     PLUGINS
         Core
-        ${ZLIB_PLUGIN}
+        zlib
     TESTS
         tests
 )
diff --git a/src/plugins/thirdParty/OpenSSL/CMakeLists.txt b/src/plugins/thirdParty/OpenSSL/CMakeLists.txt
@@ -71,43 +71,39 @@ IF(USE_PREBUILT_OPENSSL_PACKAGE)
     IF(WIN32)
         IF(RELEASE_MODE)
             RETRIEVE_PACKAGE_FILE(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${RELATIVE_PROJECT_SOURCE_DIR} 3acf4912793bb796e91b5f88903e134ccc664b14
+                                  ${RELATIVE_PROJECT_SOURCE_DIR} 2bda3172badee3f1daca3a05fad02d914b975f56
                                   RELEASE_TAG ${RELEASE_TAG}
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES ddbb7491d59caa3a61297f81a13d3e25b6c09bc0
-                                              3efe6f60e279b52f27934b92ac8c5d183d0e84d0
-                                              aa4cd8163b9cc97e87f872b3b71b520fb045a6aa
-                                              a87ba18be63256fdc0b87b563caa6356ee9f5279)
+                                  SHA1_VALUES 9322e41caec6b4087ad4a7ac9665b5dfb7bfc867
+                                              369340018f310bd7cb631a773ab5921812a568f0
+                                              d33797a9bd0df69694a39db0224de907cd382585
+                                              a61987feb80d7b1565da22f407c1e99c613d8ad1)
         ELSE()
             RETRIEVE_PACKAGE_FILE(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${RELATIVE_PROJECT_SOURCE_DIR} 993b7b921bea105477d359a48e7b84f555ead43c
+                                  ${RELATIVE_PROJECT_SOURCE_DIR} 07fea34f373bc63a63fe622802c14b13b6715763
                                   RELEASE_TAG ${RELEASE_TAG}
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES 6d3bc9a5c8cd8a9f2dc04062b36973e3d0b6eb73
-                                              1131626c1c72ec55a1e3eae86824c4df67d4673c
-                                              33dfed89cf676b95300a8c1b455169437a4f1c74
-                                              76059318ded5f4b06938191f3c1ef9e1b3e394bd)
+                                  SHA1_VALUES 2e5d35e882783398d8026d7ea8e604e7dcfcc690
+                                              3c1c6f367f38b1e5b9a0aca97e4bb910f48f11cf
+                                              1078cc30575d001248951db9cdeb0ed74635588e
+                                              55932ae5d960a309d137f3b919efe3a5a6907b2a)
         ENDIF()
     ELSEIF(APPLE)
         RETRIEVE_PACKAGE_FILE(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${RELATIVE_PROJECT_SOURCE_DIR} 506711d5e1bc4d35f3522e3ca4fcad860e11a668
+                              ${RELATIVE_PROJECT_SOURCE_DIR} d348f274e1bd63b5224e068de69413d2aa0234de
                               RELEASE_TAG ${RELEASE_TAG}
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES fef82d73112a933c55c27454caffc2458c84f09d
-                                          f2733ac26ed67d1ed56a932828de1a2877cd674e)
+                              SHA1_VALUES 15ee34b4d987310df6214ac0838e2e084783490d
+                                          8d0c3218cb2090c42e11e013823115177a701ba1)
     ELSE()
         RETRIEVE_PACKAGE_FILE(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${RELATIVE_PROJECT_SOURCE_DIR} b36071fe6d377596d1152fabef2e279862d68085
+                              ${RELATIVE_PROJECT_SOURCE_DIR} acc1dafdb5e5e2a3ce75779ba2956875300373c5
                               RELEASE_TAG ${RELEASE_TAG}
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES c24fac02bcecb0d3e7f438401562acd72333ea66
-                                          88583b407a4625ee157d25b35ce9328e023d8584)
+                              SHA1_VALUES 449160cd3e6420c180199f19c1e0685d0e5770a1
+                                          be3a2cc75ffcbfbdccf7eff62f0fc7bbc5a09cd8)
     ENDIF()
 ELSE()
-    # Rely on the ExternalProject module to build our package
-
-    INCLUDE(ExternalProject)
-
     # We require perl for OpenSSL's configuration tool
 
     FIND_PACKAGE(Perl REQUIRED QUIET)
@@ -225,7 +221,7 @@ ELSE()
                         SHA1_FILES ${SHA1_FILES}
                         TARGET ${PACKAGE_BUILD})
 
-    SET(PLUGIN_DEPENDS_ON ${PACKAGE_BUILD})
+    SET(DEPENDS_ON ${PACKAGE_BUILD})
 ENDIF()
 
 # Allow other external projects to find our OpenSSL package
@@ -242,8 +238,6 @@ SET(OPENSSL_LIBRARIES
 
 # Add the plugin
 
-SET(OPENSSL_PLUGIN ${PACKAGE_NAME} PARENT_SCOPE)
-
 ADD_PLUGIN(${PACKAGE_NAME}
     SOURCES
         ../../plugininfo.cpp
@@ -262,5 +256,5 @@ ADD_PLUGIN(${PACKAGE_NAME}
     EXTERNAL_BINARIES
         ${EXTERNAL_BINARIES}
     DEPENDS_ON
-        ${PLUGIN_DEPENDS_ON}
+        ${DEPENDS_ON}
 )
diff --git a/src/plugins/thirdParty/zlib/CMakeLists.txt b/src/plugins/thirdParty/zlib/CMakeLists.txt
@@ -64,33 +64,29 @@ IF(USE_PREBUILT_ZLIB_PACKAGE)
     IF(WIN32)
         IF(RELEASE_MODE)
             RETRIEVE_PACKAGE_FILE(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${RELATIVE_PROJECT_SOURCE_DIR} 46f64af9fea228a3afa6d64bad1a0700ba20c67b
+                                  ${RELATIVE_PROJECT_SOURCE_DIR} 40fb8671f71f4ecd30c497da77a056deff27e68e
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES 6a8408008702971d5cbf5e6f49953273d6e2f249
-                                              63892d9f0e54248c4c6f97ca0ba5342938b52d0e)
+                                  SHA1_VALUES 14aa954cecdf06d43bb0781b293df7f53b5a525f
+                                              1f7132f2eb4416f2b9771f0ddb19f834783a3059)
         ELSE()
             RETRIEVE_PACKAGE_FILE(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${RELATIVE_PROJECT_SOURCE_DIR} b3695becf1f964b1207dc2371aa1978973d92459
+                                  ${RELATIVE_PROJECT_SOURCE_DIR} c453bb28a886e000af2351093ca0a883906955e5
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES 2121f4b71cab6e851b2a01ac241a684a75ee06ad
-                                              0ef60637c15c35954fe4ca17be1837cd72bd8f69)
+                                  SHA1_VALUES eca444670fe39117f19027fda3608475a1ec1c91
+                                              d4ef983ceb32fcde51dffeb118f686394ccbf32f)
         ENDIF()
     ELSEIF(APPLE)
         RETRIEVE_PACKAGE_FILE(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${RELATIVE_PROJECT_SOURCE_DIR} 4de712a64a9121424aaf23a9683165c6af349098
+                              ${RELATIVE_PROJECT_SOURCE_DIR} e98147832b1933945e5a29c194fd570669e49f0f
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES 2da040b5883c4a00166e9a22cc49c5400d09d025)
+                              SHA1_VALUES 9c23f1d64dfa64a120e77521c896ac8e645156b1)
     ELSE()
         RETRIEVE_PACKAGE_FILE(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${RELATIVE_PROJECT_SOURCE_DIR} f9934d635b4713cdceab4aa751745029fab4f82d
+                              ${RELATIVE_PROJECT_SOURCE_DIR} 26edcea05d4bac33346d80df88144d9f53d0565c
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES e7a94eaf5cd6bfa099ffc700ea81f26e3030a065)
+                              SHA1_VALUES c1d95d3e676d5e070b803f68efe46618d983deaa)
     ENDIF()
 ELSE()
-    # Rely on the ExternalProject module to build our package
-
-    INCLUDE(ExternalProject)
-
     # Ignore some warnings
 
     IF(WIN32)
@@ -149,7 +145,7 @@ ELSE()
                         SHA1_FILES ${SHA1_FILES}
                         TARGET ${PACKAGE_BUILD})
 
-    SET(PLUGIN_DEPENDS_ON ${PACKAGE_BUILD})
+    SET(DEPENDS_ON ${PACKAGE_BUILD})
 ENDIF()
 
 # Allow other external projects to find our zlib package
@@ -160,8 +156,6 @@ SET(ZLIB_LIBRARY ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR}/lib/${IMPORT_LIBRARY} PARENT
 
 # Add the plugin
 
-SET(ZLIB_PLUGIN ${PACKAGE_NAME} PARENT_SCOPE)
-
 ADD_PLUGIN(${PACKAGE_NAME}
     SOURCES
         ../../plugininfo.cpp
@@ -180,5 +174,5 @@ ADD_PLUGIN(${PACKAGE_NAME}
     EXTERNAL_BINARIES
         ${EXTERNAL_BINARIES}
     DEPENDS_ON
-        ${PLUGIN_DEPENDS_ON}
+        ${DEPENDS_ON}
 )