From 435b647ddfd000b6cf7be67db26c0a8b7aaf31b2 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Mon, 11 Mar 2019 16:01:11 +0100 Subject: [PATCH] Compatiblilty with boost 1.57 on RedHat 6. --- bootstrap/builder/Builder.py | 13 +++++++++---- unittests/CMakeLists.txt | 1 + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/bootstrap/builder/Builder.py b/bootstrap/builder/Builder.py index 88ec95f3..4e97b8af 100644 --- a/bootstrap/builder/Builder.py +++ b/bootstrap/builder/Builder.py @@ -68,7 +68,7 @@ class Builder: if value: self._noSystemBoost = True elif attribute == "devtoolset": self._devtoolset = value - #if value: self._noSystemBoost = True + if value: self._noSystemBoost = True elif attribute == "qt5": self._qt5 = value elif attribute == "openmp": self._openmp = value elif attribute == "enableDoc": self._enableDoc = value @@ -139,7 +139,7 @@ class Builder: if i: commandAsString += ' ' if ' ' in command[i]: commandAsString += '"'+command[i]+'"' else: commandAsString += command[i] - command = [ 'scl', 'enable', 'boost157', 'devtoolset-%d' % self._devtoolset + command = [ 'scl', 'enable', 'devtoolset-%d' % self._devtoolset , commandAsString ] #print command @@ -175,7 +175,10 @@ class Builder: command = [ 'cmake' ] if self._ninja: command += [ "-G", "Ninja" ] - if self._noSystemBoost: command += [ "-D", "Boost_NO_SYSTEM_PATHS:STRING=TRUE" ] + if self._noSystemBoost: command += [ "-D", "Boost_NO_SYSTEM_PATHS:STRING=TRUE" + , "-D", "BOOST_INCLUDEDIR:STRING=/usr/include/boost157" + , "-D", "BOOST_LIBRARYDIR:STRING=/usr/lib/boost157" + ] if self._qt5: command += [ "-D", "WITH_QT5:STRING=TRUE" ] if self._openmp: command += [ "-D", "WITH_OPENMP:STRING=TRUE" ] @@ -183,7 +186,7 @@ class Builder: #, "-D", "BUILD_SHARED_LIBS:STRING=%s" % self.enableShared , "-D", "CMAKE_INSTALL_PREFIX:STRING=%s" % self.installDir , "-D", "CMAKE_INSTALL_DIR:STRING=%s" % cmakeInstallDir - #, "-D", "CMAKE_MODULE_PATH:STRING=%s" % cmakeModules + #, "-D", "CMAKE_MODULE_PATH:STRING=%s" % cmakeModules , toolSourceDir ] if not os.path.isdir(toolBuildDir): @@ -207,6 +210,8 @@ class Builder: if self._checkDeterminism == 'ON': command += [ "-D", "CHECK_DETERMINISM:STRING=ON" ] command += [ toolSourceDir ] + print self._noSystemBoost + print command self._execute ( command, "Second CMake failed" ) if self._doBuild: diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt index 789013cd..405db044 100644 --- a/unittests/CMakeLists.txt +++ b/unittests/CMakeLists.txt @@ -23,6 +23,7 @@ find_package(Libexecinfo REQUIRED) find_package(PythonLibs 2 REQUIRED) find_package(PythonSitePackages REQUIRED) + find_package(LEFDEF) find_package(VLSISAPD REQUIRED) find_package(HURRICANE REQUIRED) find_package(CORIOLIS REQUIRED)