102 lines
4.2 KiB
Diff
102 lines
4.2 KiB
Diff
diff -ruaN madlib-1.17.0/src/CMakeLists.txt my_madlib-1.17.0/src/CMakeLists.txt
|
|
--- madlib-1.17.0/src/CMakeLists.txt 2020-04-03 22:39:11.000000000 +0300
|
|
+++ my_madlib-1.17.0/src/CMakeLists.txt 2024-04-19 19:44:46.590279591 +0300
|
|
@@ -41,6 +41,8 @@
|
|
set(BOOST_TAR "boost_${_BOOST_TAR_VERSION_UNDERSCORES}.tar.gz")
|
|
set(BOOST_URL "${SOURCEFORGE_BASE_URL}/boost/files/${BOOST_TAR}")
|
|
|
|
+set(BOOST_TAR_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/downloads/source_archive_for_madlib/boost_1_61_0.tar.gz)
|
|
+
|
|
if(NOT BOOST_TAR_SOURCE)
|
|
find_file(BOOST_TAR_SOURCE ${BOOST_TAR}
|
|
PATHS ${MAD_THIRD_PARTY}/downloads)
|
|
@@ -57,9 +59,11 @@
|
|
|
|
set(EIGEN_VERSION "branches/3.2")
|
|
set(EIGEN_URL "${EIGEN_BASE_URL}/${EIGEN_VERSION}.tar.gz")
|
|
-set(EIGEN_TAR_MD5 13bc1043270d8f4397339c0cb0b62938)
|
|
+set(EIGEN_TAR_MD5 f0cf9b6f44018b884f0a59d2b72f978f)
|
|
set(EIGEN_MPL2_ONLY TRUE)
|
|
|
|
+set(EIGEN_TAR_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/downloads/source_archive_for_madlib/eigen-branches-3.2.tar.gz)
|
|
+
|
|
if(NOT EIGEN_TAR_SOURCE)
|
|
STRING(REGEX REPLACE "/" "-" EIGEN_VERSION_NO_SLASH ${EIGEN_VERSION})
|
|
set(EIGEN_TAR "eigen-${EIGEN_VERSION_NO_SLASH}.tar.gz") # eigen-branches-3.2.tar.gz
|
|
@@ -82,6 +86,9 @@
|
|
set(PYXB_TAR "PyXB-${PYXB_VERSION}.tar.gz")
|
|
set(PYXB_URL "${SOURCEFORGE_BASE_URL}/pyxb/files/${PYXB_TAR}")
|
|
|
|
+set(PYXB_TAR_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/downloads/source_archive_for_madlib/PyXB-1.2.6.tar.gz)
|
|
+
|
|
+
|
|
if(NOT PYXB_TAR_SOURCE)
|
|
find_file(PYXB_TAR_SOURCE ${PYXB_TAR}
|
|
PATHS ${MAD_THIRD_PARTY}/downloads)
|
|
@@ -106,31 +113,31 @@
|
|
|
|
# -- Third-party dependencies: Find or download Boost --------------------------
|
|
|
|
-find_package(Boost 1.47)
|
|
-if(Boost_FOUND)
|
|
- # We use BOOST_ASSERT_MSG, which only exists in Boost 1.47 and later.
|
|
- # Unfortunately, the FindBoost module seems to be broken with respect to
|
|
- # version checking, so we will set Boost_FOUND to FALSE if the version is
|
|
- # too old.
|
|
- if(Boost_VERSION LESS 104600)
|
|
- message(STATUS "No sufficiently recent version (>= 1.47) of Boost was found. Will download.")
|
|
- set(Boost_FOUND FALSE)
|
|
- endif(Boost_VERSION LESS 104600)
|
|
-
|
|
- # BOOST 1.65.0 removed the TR1 library which is required by MADlib till
|
|
- # C++11 is completely supported. Hence, we force download of a compatible
|
|
- # version if existing Boost is 1.65 or greater. FIXME: This should be
|
|
- # removed when TR1 dependency is removed.
|
|
- if(NOT Boost_VERSION LESS 106500)
|
|
- message(STATUS
|
|
- "Incompatible Boost version (>= 1.65) found. Will download a compatible version.")
|
|
- set(Boost_FOUND FALSE)
|
|
- endif(NOT Boost_VERSION LESS 106500)
|
|
-endif(Boost_FOUND)
|
|
-
|
|
-if(Boost_FOUND)
|
|
- include_directories(${Boost_INCLUDE_DIRS})
|
|
-else(Boost_FOUND)
|
|
+#find_package(Boost 1.47)
|
|
+#if(Boost_FOUND)
|
|
+# # We use BOOST_ASSERT_MSG, which only exists in Boost 1.47 and later.
|
|
+# # Unfortunately, the FindBoost module seems to be broken with respect to
|
|
+# # version checking, so we will set Boost_FOUND to FALSE if the version is
|
|
+# # too old.
|
|
+# if(Boost_VERSION LESS 104600)
|
|
+# message(STATUS "No sufficiently recent version (>= 1.47) of Boost was found. Will download.")
|
|
+# set(Boost_FOUND FALSE)
|
|
+# endif(Boost_VERSION LESS 104600)
|
|
+#
|
|
+# # BOOST 1.65.0 removed the TR1 library which is required by MADlib till
|
|
+# # C++11 is completely supported. Hence, we force download of a compatible
|
|
+# # version if existing Boost is 1.65 or greater. FIXME: This should be
|
|
+# # removed when TR1 dependency is removed.
|
|
+# if(NOT Boost_VERSION LESS 106500)
|
|
+# message(STATUS
|
|
+# "Incompatible Boost version (>= 1.65) found. Will download a compatible version.")
|
|
+# set(Boost_FOUND FALSE)
|
|
+# endif(NOT Boost_VERSION LESS 106500)
|
|
+#endif(Boost_FOUND)
|
|
+#
|
|
+#if(Boost_FOUND)
|
|
+# include_directories(${Boost_INCLUDE_DIRS})
|
|
+#else(Boost_FOUND)
|
|
ExternalProject_Add(EP_boost
|
|
PREFIX ${MAD_THIRD_PARTY}
|
|
DOWNLOAD_DIR ${MAD_THIRD_PARTY}/downloads
|
|
@@ -142,7 +149,7 @@
|
|
BINARY_DIR ${MAD_THIRD_PARTY}/src/EP_boost
|
|
)
|
|
include_directories(BEFORE SYSTEM ${MAD_THIRD_PARTY}/src/EP_boost)
|
|
-endif(Boost_FOUND)
|
|
+#endif(Boost_FOUND)
|
|
|
|
|
|
# -- Third-party dependencies: Download the C++ linear-algebra library Eigen ---
|