Merge f517d3d into 4ddf28c

opencor · Jun 25, 2019 · 8fb634a · 8fb634a
2 parents 4ddf28c + f517d3d
commit 8fb634a
Show file tree

Hide file tree

Showing 19 changed files with 24 additions and 24 deletions.
diff --git a/cmake/common.cmake b/cmake/common.cmake
@@ -298,7 +298,7 @@ macro(add_plugin PLUGIN_NAME)
             # Link the plugin to the external library
 
             if(WIN32)
-                string(REGEX REPLACE "${CMAKE_SHARED_LIBRARY_SUFFIX}$" "${CMAKE_IMPORT_LIBRARY_SUFFIX}"
+                string(REPLACE "${CMAKE_SHARED_LIBRARY_SUFFIX}$" "${CMAKE_IMPORT_LIBRARY_SUFFIX}"
                        IMPORT_EXTERNAL_BINARY "${FULL_EXTERNAL_BINARY}")
 
                 target_link_libraries(${PROJECT_NAME}
@@ -478,7 +478,7 @@ macro(add_plugin PLUGIN_NAME)
                         set(FULL_EXTERNAL_BINARY "${ARG_EXTERNAL_BINARIES_DIR}/${ARG_EXTERNAL_BINARY}")
 
                         if(WIN32)
-                            string(REGEX REPLACE "${CMAKE_SHARED_LIBRARY_SUFFIX}$" "${CMAKE_IMPORT_LIBRARY_SUFFIX}"
+                            string(REPLACE "${CMAKE_SHARED_LIBRARY_SUFFIX}$" "${CMAKE_IMPORT_LIBRARY_SUFFIX}"
                                    IMPORT_EXTERNAL_BINARY "${FULL_EXTERNAL_BINARY}")
 
                             target_link_libraries(${TEST_NAME}
@@ -863,7 +863,7 @@ macro(create_package_file PACKAGE_NAME PACKAGE_VERSION)
 
     # The full path to the package's files
 
-    string(REGEX REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
+    string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
            DIRNAME "${PROJECT_SOURCE_DIR}/${EXTERNAL_PACKAGE_DIR}")
 
     # Remove any historical package archive

diff --git a/src/3rdparty/QtWebKit/CMakeLists.txt b/src/3rdparty/QtWebKit/CMakeLists.txt
@@ -24,7 +24,7 @@ set(RELEASE_TAG v5.12.0)
 
 # Specify where our local package will be installed
 
-string(REGEX REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
+string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
        FULL_LOCAL_EXTERNAL_PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${EXTERNAL_PACKAGE_DIR}")
 
 # Name of our package's shared library (and of its import library, if any)

diff --git a/src/plugins/thirdParty/CellMLAPI/CMakeLists.txt b/src/plugins/thirdParty/CellMLAPI/CMakeLists.txt
@@ -45,7 +45,7 @@ set(RELEASE_TAG 1.12)
 
 # Specify where our local package will be installed
 
-string(REGEX REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
+string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
        FULL_LOCAL_EXTERNAL_PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${EXTERNAL_PACKAGE_DIR}")
 
 # Name of our package's shared libraries (and of their import libraries, if any)

diff --git a/src/plugins/thirdParty/LLVMClang/CMakeLists.txt b/src/plugins/thirdParty/LLVMClang/CMakeLists.txt
@@ -16,7 +16,7 @@ set(GIT_TAG v8.0.0)
 
 # Specify where our local package will be installed
 
-string(REGEX REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
+string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
        FULL_LOCAL_EXTERNAL_PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${EXTERNAL_PACKAGE_DIR}")
 
 # Name of our package's shared libraries (and of their import libraries, if any)

diff --git a/src/plugins/thirdParty/LibXDiff/CMakeLists.txt b/src/plugins/thirdParty/LibXDiff/CMakeLists.txt
@@ -16,7 +16,7 @@ set(GIT_TAG v0.23)
 
 # Specify where our local package will be installed
 
-string(REGEX REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
+string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
        FULL_LOCAL_EXTERNAL_PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${EXTERNAL_PACKAGE_DIR}")
 
 # Name of our package's shared library (and of its import library, if any)

diff --git a/src/plugins/thirdParty/OAuth/CMakeLists.txt b/src/plugins/thirdParty/OAuth/CMakeLists.txt
@@ -20,7 +20,7 @@ set(RELEASE_TAG 1.0.1b)
 
 # Specify where our local package will be installed
 
-string(REGEX REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
+string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
        FULL_LOCAL_EXTERNAL_PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${EXTERNAL_PACKAGE_DIR}")
 
 # Name of our package's shared library (and of its import library, if any)

diff --git a/src/plugins/thirdParty/OpenSSL/CMakeLists.txt b/src/plugins/thirdParty/OpenSSL/CMakeLists.txt
@@ -19,7 +19,7 @@ set(RELEASE_TAG OpenSSL_1_0_2s)
 
 # Specify where our local package will be installed
 
-string(REGEX REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
+string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
        FULL_LOCAL_EXTERNAL_PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${EXTERNAL_PACKAGE_DIR}")
 
 # Name of our package's shared libraries (and of their import libraries, if any)

diff --git a/src/plugins/thirdParty/Python/CMakeLists.txt b/src/plugins/thirdParty/Python/CMakeLists.txt
@@ -22,7 +22,7 @@ set(WHEEL_GIT_TAG "0.31.0")
 
 # Specify where our local package will be installed
 
-string(REGEX REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
+string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
        FULL_LOCAL_EXTERNAL_PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${EXTERNAL_PACKAGE_DIR}")
 
 # Set the ABI flag and version identifier
@@ -363,7 +363,7 @@ else()
         # _freeze_importlib.exe, which is run as part of the Python build, needs
         # our zlib DLL
 
-        string(REGEX REPLACE "${CMAKE_IMPORT_LIBRARY_SUFFIX}$" "${CMAKE_SHARED_LIBRARY_SUFFIX}"
+        string(REPLACE "${CMAKE_IMPORT_LIBRARY_SUFFIX}$" "${CMAKE_SHARED_LIBRARY_SUFFIX}"
                ZLIB_DLL "${ZLIB_LIBRARY}")
 
         ExternalProject_Add_Step(${PACKAGE_BUILD} copyZlib
@@ -375,9 +375,9 @@ else()
         # import libraries and we must use our DLLs when we run Python in
         # subsequent steps below
 
-        string(REGEX REPLACE "${CMAKE_IMPORT_LIBRARY_SUFFIX}$" "${CMAKE_SHARED_LIBRARY_SUFFIX}"
+        string(REPLACE "${CMAKE_IMPORT_LIBRARY_SUFFIX}$" "${CMAKE_SHARED_LIBRARY_SUFFIX}"
                OPENSSL_CRYPTO_DLL "${OPENSSL_CRYPTO_LIBRARY}")
-        string(REGEX REPLACE "${CMAKE_IMPORT_LIBRARY_SUFFIX}$" "${CMAKE_SHARED_LIBRARY_SUFFIX}"
+        string(REPLACE "${CMAKE_IMPORT_LIBRARY_SUFFIX}$" "${CMAKE_SHARED_LIBRARY_SUFFIX}"
                OPENSSL_SSL_DLL "${OPENSSL_SSL_LIBRARY}")
 
         ExternalProject_Add_Step(${PACKAGE_BUILD} copyDlls

diff --git a/src/plugins/thirdParty/PythonPackages/CMakeLists.txt b/src/plugins/thirdParty/PythonPackages/CMakeLists.txt
@@ -25,7 +25,7 @@ set(WHEEL_REPOSITORY ${GITHUB_OPENCOR}/python/releases/download/wheels)
 
 # Specify where our local package will be installed
 
-string(REGEX REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
+string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
        FULL_LOCAL_EXTERNAL_PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${EXTERNAL_PACKAGE_DIR}")
 
 # Where Python packages are installed

diff --git a/src/plugins/thirdParty/QScintilla/CMakeLists.txt b/src/plugins/thirdParty/QScintilla/CMakeLists.txt
@@ -16,7 +16,7 @@ set(GIT_TAG v2.11.1)
 
 # Specify where our local package will be installed
 
-string(REGEX REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
+string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
        FULL_LOCAL_EXTERNAL_PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${EXTERNAL_PACKAGE_DIR}")
 
 # Name of our package's shared library (and of its import library, if any)

diff --git a/src/plugins/thirdParty/Qwt/CMakeLists.txt b/src/plugins/thirdParty/Qwt/CMakeLists.txt
@@ -16,7 +16,7 @@ set(GIT_TAG v6.1.4)
 
 # Specify where our local package will be installed
 
-string(REGEX REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
+string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
        FULL_LOCAL_EXTERNAL_PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${EXTERNAL_PACKAGE_DIR}")
 
 # Name of our package's shared libraries (and of their import libraries, if any)

diff --git a/src/plugins/thirdParty/SUNDIALS/CMakeLists.txt b/src/plugins/thirdParty/SUNDIALS/CMakeLists.txt
@@ -37,7 +37,7 @@ set(GIT_TAG v4.1.0)
 
 # Specify where our local package will be installed
 
-string(REGEX REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
+string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
        FULL_LOCAL_EXTERNAL_PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${EXTERNAL_PACKAGE_DIR}")
 
 # Name of our package's shared libraries (and of their import libraries, if any)

diff --git a/src/plugins/thirdParty/Zinc/CMakeLists.txt b/src/plugins/thirdParty/Zinc/CMakeLists.txt
@@ -16,7 +16,7 @@ set(GIT_TAG v3.1.2)
 
 # Specify where our local package will be installed
 
-string(REGEX REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
+string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
        FULL_LOCAL_EXTERNAL_PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${EXTERNAL_PACKAGE_DIR}")
 
 # Name of our package's shared libraries (and of their import libraries, if any)

diff --git a/src/plugins/thirdParty/libBioSignalML/CMakeLists.txt b/src/plugins/thirdParty/libBioSignalML/CMakeLists.txt
@@ -25,7 +25,7 @@ set(RELEASE_TAG v0.8.4)
 
 # Specify where our local package will be installed
 
-string(REGEX REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
+string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
        FULL_LOCAL_EXTERNAL_PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${EXTERNAL_PACKAGE_DIR}")
 
 # Name of our package's shared libraries (and of their import libraries, if any)

diff --git a/src/plugins/thirdParty/libNuML/CMakeLists.txt b/src/plugins/thirdParty/libNuML/CMakeLists.txt
@@ -20,7 +20,7 @@ set(PACKAGE_REPOSITORY NuML)
 
 # Specify where our local package will be installed
 
-string(REGEX REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
+string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
        FULL_LOCAL_EXTERNAL_PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${EXTERNAL_PACKAGE_DIR}")
 
 # Name of our package's shared library (and of its import library, if any)

diff --git a/src/plugins/thirdParty/libSBML/CMakeLists.txt b/src/plugins/thirdParty/libSBML/CMakeLists.txt
@@ -20,7 +20,7 @@ set(PACKAGE_REPOSITORY libsbml)
 
 # Specify where our local package will be installed
 
-string(REGEX REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
+string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
        FULL_LOCAL_EXTERNAL_PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${EXTERNAL_PACKAGE_DIR}")
 
 # Name of our package's shared library (and of its import library, if any)

diff --git a/src/plugins/thirdParty/libSEDML/CMakeLists.txt b/src/plugins/thirdParty/libSEDML/CMakeLists.txt
@@ -20,7 +20,7 @@ set(PACKAGE_REPOSITORY libSEDML)
 
 # Specify where our local package will be installed
 
-string(REGEX REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
+string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
        FULL_LOCAL_EXTERNAL_PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${EXTERNAL_PACKAGE_DIR}")
 
 # Name of our package's shared library (and of its import library, if any)

diff --git a/src/plugins/thirdParty/libgit2/CMakeLists.txt b/src/plugins/thirdParty/libgit2/CMakeLists.txt
@@ -21,7 +21,7 @@ set(RELEASE_TAG v0.28.1-opencor-2)
 
 # Specify where our local package will be installed
 
-string(REGEX REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
+string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
        FULL_LOCAL_EXTERNAL_PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${EXTERNAL_PACKAGE_DIR}")
 
 # Name of our package's shared library (and of its import library, if any)

diff --git a/src/plugins/thirdParty/zlib/CMakeLists.txt b/src/plugins/thirdParty/zlib/CMakeLists.txt
@@ -16,7 +16,7 @@ set(GIT_TAG v1.2.11)
 
 # Specify where our local package will be installed
 
-string(REGEX REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
+string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_SOURCE_DIR}/ext"
        FULL_LOCAL_EXTERNAL_PACKAGE_DIR "${PROJECT_SOURCE_DIR}/${EXTERNAL_PACKAGE_DIR}")
 
 # Name of our package's shared library (and of its import library, if any)