diff options
| author | Vojtech Bubnik <bubnikv@gmail.com> | 2021-02-05 13:19:35 +0300 |
|---|---|---|
| committer | Vojtech Bubnik <bubnikv@gmail.com> | 2021-02-05 13:19:35 +0300 |
| commit | 4e13a8fe19abcc9aae39a9bc4c7953a743196504 (patch) | |
| tree | 3e2eab0cf9d8d7d910f4bc59486578b637fa1b10 | |
| parent | 6ae76640942269993c942861f0444088843e3fa1 (diff) | |
| parent | 6f89da1f394561c7338676a1c8e8e72faeb85aad (diff) | |
Merge remote-tracking branch 'remotes/origin/master' into vb_edgegrid_open_linesvb_edgegrid_open_lines
| -rw-r--r-- | deps/deps-linux.cmake | 1 | ||||
| -rw-r--r-- | deps/deps-macos.cmake | 1 | ||||
| -rw-r--r-- | deps/deps-windows.cmake | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/deps/deps-linux.cmake b/deps/deps-linux.cmake index 2da289097..35522504c 100644 --- a/deps/deps-linux.cmake +++ b/deps/deps-linux.cmake @@ -26,6 +26,7 @@ ExternalProject_Add(dep_boost variant=release threading=multi boost.locale.icu=off + --disable-icu cflags=-fPIC cxxflags=-fPIC install diff --git a/deps/deps-macos.cmake b/deps/deps-macos.cmake index bf9501ca0..53ba008c3 100644 --- a/deps/deps-macos.cmake +++ b/deps/deps-macos.cmake @@ -33,6 +33,7 @@ ExternalProject_Add(dep_boost variant=release threading=multi boost.locale.icu=off + --disable-icu "cflags=-fPIC -mmacosx-version-min=${DEP_OSX_TARGET}" "cxxflags=-fPIC -mmacosx-version-min=${DEP_OSX_TARGET}" "mflags=-fPIC -mmacosx-version-min=${DEP_OSX_TARGET}" diff --git a/deps/deps-windows.cmake b/deps/deps-windows.cmake index 81d52b842..c0d80bb29 100644 --- a/deps/deps-windows.cmake +++ b/deps/deps-windows.cmake @@ -76,6 +76,7 @@ ExternalProject_Add(dep_boost variant=release threading=multi boost.locale.icu=off + --disable-icu "${DEP_BOOST_DEBUG}" release install INSTALL_COMMAND "" # b2 does that already ) |