diff options
| author | Luca Rood <dev@lucarood.com> | 2019-03-02 04:53:09 +0300 |
|---|---|---|
| committer | Luca Rood <dev@lucarood.com> | 2019-03-02 04:53:09 +0300 |
| commit | d5c2be7031912cca8f58e90283eb52f63f71b32f (patch) | |
| tree | 9a3061a1aea0d090d5ebb01820ebabb3d1c6ab22 | |
| parent | 490a385c8124dea09c3d06cc0dd546189bc6ec11 (diff) | |
CMake: Use static libstdc++ for static builds
This enables static linking of libstdc++ by default when building using
`WITH_STATIC_LIBS`. This makes builds more portable for anyone making
static builds (in particular for older systems).
Reviewed By: brecht, campbellbarton, sergey
Differential Revision: https://developer.blender.org/D4393
| -rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 4 | ||||
| m--------- | release/datafiles/locale | 0 | ||||
| m--------- | release/scripts/addons | 0 | ||||
| m--------- | release/scripts/addons_contrib | 0 |
4 files changed, 4 insertions, 0 deletions
diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index 2bfc4cda20c..0d486c84fe6 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -39,6 +39,10 @@ if(EXISTS ${LIBDIR}) set(WITH_OPENMP_STATIC ON) endif() +if(WITH_STATIC_LIBS) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++") +endif() + # Wrapper to prefer static libraries macro(find_package_wrapper) if(WITH_STATIC_LIBS) diff --git a/release/datafiles/locale b/release/datafiles/locale -Subproject 29c2218102135522d6e2cd4bba7ab47d7241ab8 +Subproject f81ed052157aff3979763cf25840032d11d261b diff --git a/release/scripts/addons b/release/scripts/addons -Subproject c94604993b3e0bfbc733861e890aff18513e02b +Subproject 26330ab14347cef00d67e2e4335c9609082e227 diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib -Subproject 3a80a18ea081ff93f4b3672120b446b7adc93e8 +Subproject 57596569d9bc50230a0430e7ed159c963c00814 |