jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Corrections to build under MacOS X.

This commit is contained in:
Jean-Paul Chaput 2019-12-11 22:13:47 +01:00
parent 09eccacfee
commit 9812f2fc3a
5 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bootstrap/builder/Builder.py
View File

@ -187,8 +187,8 @@ class Builder:
if self._ninja: command += [ "-G", "Ninja" ] if self._ninja: command += [ "-G", "Ninja" ]
if self._macports: command += [ "-D", "WITH_MACPORTS:STRING=TRUE" ] if self._macports: command += [ "-D", "WITH_MACPORTS:STRING=TRUE" ]
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/boost169" #, "-D", "BOOST_INCLUDEDIR:STRING=/usr/include/boost169"
, "-D", "BOOST_LIBRARYDIR:STRING=/usr/lib64/boost169" #, "-D", "BOOST_LIBRARYDIR:STRING=/usr/lib64/boost169"
] ]
if self._qt5: command += [ "-D", "WITH_QT5:STRING=TRUE" ] if self._qt5: command += [ "-D", "WITH_QT5:STRING=TRUE" ]
if self._openmp: command += [ "-D", "WITH_OPENMP:STRING=TRUE" ] if self._openmp: command += [ "-D", "WITH_OPENMP:STRING=TRUE" ]
@ -198,6 +198,7 @@ class Builder:
, "-D", "CMAKE_INSTALL_PREFIX:STRING=%s" % self.installDir , "-D", "CMAKE_INSTALL_PREFIX:STRING=%s" % self.installDir
, "-D", "CMAKE_INSTALL_DIR:STRING=%s" % cmakeInstallDir , "-D", "CMAKE_INSTALL_DIR:STRING=%s" % cmakeInstallDir
#, "-D", "CMAKE_MODULE_PATH:STRING=%s" % cmakeModules #, "-D", "CMAKE_MODULE_PATH:STRING=%s" % cmakeModules
#, "-D", "Boost_DEBUG:STRING=TRUE"
, toolSourceDir ] , toolSourceDir ]
if not os.path.isdir(toolBuildDir): if not os.path.isdir(toolBuildDir):

24
bootstrap/cmake_modules/FindBootstrap.cmake
View File

@ -39,6 +39,15 @@
message("-- Distribution is ${DISTRIBUTION}") message("-- Distribution is ${DISTRIBUTION}")
endmacro(check_distribution) endmacro(check_distribution)
#
# Specific setup for MacOS X.
#
if(WITH_MACPORTS)
set(Boost_PYVER "27")
else()
set(Boost_PYVER "")
endif()
# #
# Get the svn revision version and configure a svn.h.in file based on this version # Get the svn revision version and configure a svn.h.in file based on this version
# The include directory name is passed as argument # The include directory name is passed as argument
@ -175,15 +184,6 @@
endmacro(hurricane_check_libraries) endmacro(hurricane_check_libraries)
#
# Find Boost, checking different versions.
#
if(WITH_MACPORTS)
set(Boost_PYVER "27")
else()
set(Boost_PYVER "")
endif()
macro(setup_boost) macro(setup_boost)
#set(Boost_USE_STATIC_LIBS ON) #set(Boost_USE_STATIC_LIBS ON)
#message(STATUS "Always uses Boost static libraries.") #message(STATUS "Always uses Boost static libraries.")
@ -191,7 +191,7 @@
find_package(Boost 1.35.0 REQUIRED) find_package(Boost 1.35.0 REQUIRED)
else(ARGC LESS 1) else(ARGC LESS 1)
foreach(component ${ARGV}) foreach(component ${ARGV})
if(${component} EQUAL "python") if(${component} STREQUAL "python")
set(component ${component}${Boost_PYVER}) set(component ${component}${Boost_PYVER})
endif() endif()
set(components ${components} ${component}) set(components ${components} ${component})
@ -278,11 +278,13 @@
else() else()
find_path(QWT_INCLUDE_DIR NAMES qwt.h find_path(QWT_INCLUDE_DIR NAMES qwt.h
PATHS /usr/include/qwt-qt4 PATHS /usr/include/qwt-qt4
/opt/local/libexec/qt4/include
/usr/include/qt4 /usr/include/qt4
/usr/include /usr/include
PATH_SUFFIXES qwt ) PATH_SUFFIXES qwt )
find_library(QWT_LIBRARY NAMES qwt-qt4 qwt find_library(QWT_LIBRARY NAMES qwt-qt4 qwt
PATHS /usr/lib${LIB_SUFFIX} ) PATHS /opt/local/libexec/qt4/lib
/usr/lib${LIB_SUFFIX} )
endif() endif()
if( QWT_INCLUDE_DIR AND QWT_LIBRARY) if( QWT_INCLUDE_DIR AND QWT_LIBRARY)

2
bora/src/CMakeLists.txt
View File

@ -102,7 +102,7 @@
${PYTHON_LIBRARIES} -lutil ${PYTHON_LIBRARIES} -lutil
) )
add_library( bora ${cpps} ${mocCpps} ) add_library( bora ${cpps} ${mocCpps} ${pyCpps} )
set_target_properties( bora PROPERTIES VERSION 1.0 SOVERSION 1 ) set_target_properties( bora PROPERTIES VERSION 1.0 SOVERSION 1 )
target_link_libraries( bora ${depLibs} ) target_link_libraries( bora ${depLibs} )

6
crlcore/src/ccore/lefdef/LefImport.cpp
View File

@ -887,7 +887,11 @@ namespace CRL {
void LefImport::reset () void LefImport::reset ()
{ LefParser::reset(); } {
#if defined(HAVE_LEFDEF)
LefParser::reset();
#endif
}
} // End of CRL namespace. } // End of CRL namespace.

2
knik/src/CMakeLists.txt
View File

@ -46,6 +46,7 @@
add_library ( knik ${cpps} ${mocCpps} ) add_library ( knik ${cpps} ${mocCpps} )
set_target_properties ( knik PROPERTIES VERSION 1.0 SOVERSION 1 ) set_target_properties ( knik PROPERTIES VERSION 1.0 SOVERSION 1 )
target_link_libraries ( knik ${FLUTE_LIBRARY} target_link_libraries ( knik ${FLUTE_LIBRARY}
${CORIOLIS_LIBRARIES}
${HURRICANE_PYTHON_LIBRARIES} ${HURRICANE_PYTHON_LIBRARIES}
${HURRICANE_GRAPHICAL_LIBRARIES} ${HURRICANE_GRAPHICAL_LIBRARIES}
${HURRICANE_LIBRARIES} ${HURRICANE_LIBRARIES}
@ -53,6 +54,7 @@
${CIF_LIBRARY} ${CIF_LIBRARY}
${AGDS_LIBRARY} ${AGDS_LIBRARY}
${UTILITIES_LIBRARY} ${UTILITIES_LIBRARY}
${FLUTE_LIBRARIES}
${LEFDEF_LIBRARIES} ${LEFDEF_LIBRARIES}
${OA_LIBRARIES} ${OA_LIBRARIES}
${QtX_LIBRARIES} ${QtX_LIBRARIES}