gnucash unstable: Don't force-set Boost_USE_STATIC_LIBS or Boost_USE_STATIC_RUNTIME.

John Ralls jralls at code.gnucash.org
Mon Feb 12 17:05:40 EST 2018


Updated	 via  https://github.com/Gnucash/gnucash/commit/0912a5ea (commit)
	from  https://github.com/Gnucash/gnucash/commit/fb7426b6 (commit)



commit 0912a5eaa1901b1af8395a5e8d835cf754d77268
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Feb 12 14:00:09 2018 -0800

    Don't force-set Boost_USE_STATIC_LIBS or Boost_USE_STATIC_RUNTIME.
    
    If you need to do that for your build pass the values in on the cmake
    command line.
    
    As for all of the noise about Boost's install name if APPLE, just fix it
    with the install name tool. There are instructions at the boost module
    in gnucash.modules.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7cb430f..ecaf705 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -487,21 +487,6 @@ GNC_PKG_CHECK_MODULES (ICU4C REQUIRED icu-uc)
 GNC_PKG_CHECK_MODULES (ICU4C_I18N REQUIRED icu-i18n)
 
 #BOOST
-IF (APPLE)
-  # I suppose I would rather use the shared Boost libraries here, but the Boost install procedure
-  # does not set RPATH for it's shared library correctly. It uses a 'naked' RPATH, which requires
-  # that DYLD_FALLBACK_LIBRARY_PATH be set. There is supposedly a dll-path option to set RPATH, but
-  # I can't get it to work (http://www.boost.org/build/doc/html/bbv2/faq/dll-path.html) and neither
-  # can some other random person on the internet:
-  # http://stackoverflow.com/questions/33667795/dll-path-has-no-effect-when-building-boost
-  # Using static libs simplifies things.
-  SET (Boost_USE_STATIC_LIBS ON)
-  SET (Boost_USE_STATIC_RUNTIME ON)
-ELSE()
-  SET (Boost_USE_STATIC_LIBS OFF)
-  SET (Boost_USE_STATIC_RUNTIME OFF)
-ENDIF()
-
 SET (Boost_USE_MULTITHREADED ON)
 SET (Boost_FIND_QUIETLY ON)
 



Summary of changes:
 CMakeLists.txt | 15 ---------------
 1 file changed, 15 deletions(-)



More information about the gnucash-changes mailing list