Skip to content

Commit a80adfa

Browse files
tcadusertcaduser
committed
reactivate boost config and upgrade to boost 1.82.0
1 parent 9969875 commit a80adfa

10 files changed

Lines changed: 18 additions & 14 deletions

File tree

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@
1313
[submodule "external/umfpack_lgpl"]
1414
path = external/umfpack_lgpl
1515
url = ../umfpack_lgpl
16+
[submodule "external/boostorg/config"]
17+
path = external/boostorg/config
18+
url = https://github.com/boostorg/config

‎cmake/appveyor.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
SET (FLEX "C:/msys64/usr/bin/flex.exe")
99
SET (BISON "C:/msys64/usr/bin/bison.exe")
1010
SET (EXTERNAL_LIB ${PROJECT_SOURCE_DIR}/external)
11-
SET (BOOST_INCLUDE ${EXTERNAL_LIB}/boostorg/math/include ${EXTERNAL_LIB}/boostorg/multiprecision/include)
12-
ADD_DEFINITIONS(-DBOOST_MP_STANDALONE -DBOOST_MP_MATH_AVAILABLE)
11+
SET (BOOST_INCLUDE ${EXTERNAL_LIB}/boostorg/config/include ${EXTERNAL_LIB}/boostorg/math/include ${EXTERNAL_LIB}/boostorg/multiprecision/include)
12+
ADD_DEFINITIONS(-DBOOST_MP_STANDALONE -DBOOST_MATH_STANDALONE)
1313

1414
ADD_DEFINITIONS(-DSTATIC_BUILD -D_USE_MATH_DEFINES)
1515
#Math stuff

‎cmake/centos_6.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ SET (EXTERNAL_LIB ${PROJECT_SOURCE_DIR}/external)
33
SET (FLEX /usr/bin/flex)
44
SET (BISON /usr/bin/bison)
55

6-
SET (BOOST_INCLUDE ${EXTERNAL_LIB}/boostorg/math/include ${EXTERNAL_LIB}/boostorg/multiprecision/include)
7-
ADD_DEFINITIONS(-DBOOST_MP_STANDALONE -DBOOST_MP_MATH_AVAILABLE)
6+
SET (BOOST_INCLUDE ${EXTERNAL_LIB}/boostorg/config/include ${EXTERNAL_LIB}/boostorg/math/include ${EXTERNAL_LIB}/boostorg/multiprecision/include)
7+
ADD_DEFINITIONS(-DBOOST_MP_STANDALONE -DBOOST_MATH_STANDALONE)
88

99
SET (QUADMATH_ARCHIVE "-lquadmath")
1010

‎cmake/msys.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ ADD_COMPILE_OPTIONS(-Wall)
44
SET (FLEX flex)
55
SET (BISON bison)
66

7-
SET (BOOST_INCLUDE ${EXTERNAL_LIB}/boostorg/math/include ${EXTERNAL_LIB}/boostorg/multiprecision/include)
7+
SET (BOOST_INCLUDE ${EXTERNAL_LIB}/boostorg/config/include ${EXTERNAL_LIB}/boostorg/math/include ${EXTERNAL_LIB}/boostorg/multiprecision/include)
8+
ADD_DEFINITIONS(-DBOOST_MP_STANDALONE -DBOOST_MATH_STANDALONE)
89
ADD_DEFINITIONS(-DBOOST_NO_CXX14_CONSTEXPR)
9-
ADD_DEFINITIONS(-DBOOST_MP_STANDALONE -DBOOST_MP_MATH_AVAILABLE)
1010
#ADD_DEFINITIONS(-DSTATIC_BUILD -D_USE_MATH_DEFINES)
1111

1212
#SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:strict /EHsc ${WARNINGS_IGNORE}")

‎cmake/osx_10.10.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ SET (EXTERNAL_LIB ${PROJECT_SOURCE_DIR}/external)
55
SET (FLEX /usr/bin/flex)
66
SET (BISON /usr/bin/bison)
77

8-
SET (BOOST_INCLUDE ${EXTERNAL_LIB}/boostorg/math/include ${EXTERNAL_LIB}/boostorg/multiprecision/include)
9-
ADD_DEFINITIONS(-DBOOST_MP_STANDALONE -DBOOST_MP_MATH_AVAILABLE)
8+
SET (BOOST_INCLUDE ${EXTERNAL_LIB}/boostorg/config/include ${EXTERNAL_LIB}/boostorg/math/include ${EXTERNAL_LIB}/boostorg/multiprecision/include)
9+
ADD_DEFINITIONS(-DBOOST_MP_STANDALONE -DBOOST_MATH_STANDALONE)
1010

1111
SET (BLAS_ARCHIVE -weak-lblas -weak-llapack)
1212
SET (EXTERNAL_LIB ${PROJECT_SOURCE_DIR}/external)

‎cmake/osx_gcc.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ SET (EXTERNAL_LIB ${PROJECT_SOURCE_DIR}/external)
55
SET (FLEX /usr/bin/flex)
66
SET (BISON /usr/bin/bison)
77

8-
SET (BOOST_INCLUDE ${EXTERNAL_LIB}/boostorg/math/include ${EXTERNAL_LIB}/boostorg/multiprecision/include)
9-
ADD_DEFINITIONS(-DBOOST_MP_STANDALONE -DBOOST_MP_MATH_AVAILABLE)
8+
SET (BOOST_INCLUDE ${EXTERNAL_LIB}/boostorg/config/include ${EXTERNAL_LIB}/boostorg/math/include ${EXTERNAL_LIB}/boostorg/multiprecision/include)
9+
ADD_DEFINITIONS(-DBOOST_MP_STANDALONE -DBOOST_MATH_STANDALONE)
1010

1111
SET (QUADMATH_ARCHIVE "-lquadmath")
1212

‎cmake/ubuntu_18.04.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ SET (ZLIB_ARCHIVE -lz )
1010
SET (SQLITE3_ARCHIVE -lsqlite3)
1111

1212

13-
SET (BOOST_INCLUDE ${EXTERNAL_LIB}/boostorg/math/include ${EXTERNAL_LIB}/boostorg/multiprecision/include)
14-
ADD_DEFINITIONS(-DBOOST_MP_STANDALONE -DBOOST_MP_MATH_AVAILABLE)
13+
SET (BOOST_INCLUDE ${EXTERNAL_LIB}/boostorg/config/include ${EXTERNAL_LIB}/boostorg/math/include ${EXTERNAL_LIB}/boostorg/multiprecision/include)
14+
ADD_DEFINITIONS(-DBOOST_MP_STANDALONE -DBOOST_MATH_STANDALONE)
1515
SET (QUADMATH_ARCHIVE "-lquadmath")
1616
SET (DLOPEN_LIB -ldl)
1717
SET (SQLITE3_INCLUDE /usr/include)

‎external/boostorg/config‎

Submodule config added at 429c198

‎external/boostorg/math‎

Submodule math updated 828 files

‎external/boostorg/multiprecision‎

Submodule multiprecision updated 177 files

0 commit comments

Comments
 (0)