CMake build system fixes to build on Mac OSX

Author: robtaylor

bootstrap/cmake_modules/CMakeLists.txt

@@ -6,7 +6,6 @@
                    FindBootstrap.cmake
                    FindLibexecinfo.cmake
                    FindLibbfd.cmake
-                   FindQwt.cmake
                    FindSphinx.cmake
                    FindPelican.cmake
                    FindCOLOQUINTE.cmake

bootstrap/cmake_modules/FindBootstrap.cmake

@@ -1,5 +1,3 @@
-
-
 #
 # Setup CMake policies.
 #
@@ -82,13 +80,21 @@
  set(BUILD_SHARED_LIBS "ON")
 #set(DEBUG_FLAGS "-g -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC")
  set(DEBUG_FLAGS "-g")
+ set(CMAKE_CXX_STANDARD 17)
  if(CYGWIN)
    set(ADDITIONAL_FLAGS "-D_GLIBCXX_USE_C99")
    set(CXX_STANDARD "gnu++17")
  else()
    set(ADDTIONAL_FLAGS "")
    set(CXX_STANDARD "c++17")
  endif()
+
+ set(LINK_UNRESOLVED "-Wl,--unresolved-symbols=ignore-all")
+ if(APPLE)
+   set(LINK_UNRESOLVED "-undefined dynamic_lookup")
+ endif()
+  
+
 #set(CMAKE_C_FLAGS_DEBUG     "                     -Wall -fsanitize=address ${ADDTIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C Compiler Debug options."     FORCE)
  set(CMAKE_C_FLAGS_DEBUG     "                     -Wall                    ${ADDTIONAL_FLAGS} ${DEBUG_FLAGS}" CACHE STRING "C Compiler Debug options."     FORCE)
  set(CMAKE_C_FLAGS_RELEASE   "                     -Wall -O2                ${ADDTIONAL_FLAGS} -DNDEBUG"       CACHE STRING "C Compiler Release options."   FORCE)
@@ -159,11 +165,15 @@ endif()
  endmacro()
 #
 # sets that a library is expected to have unresolved symbols
-# Usage:  set_library_unresolved_symbols(<PROJECT>)
+# Usage:  set_has_unresolved_symbols(<PROJECT>)
 # 
 # Should be used before set_libraries_path.
  macro(set_has_unresolved_symbols configname)
-	 set(${configname}_LIBRARIES "-Wl,--unresolved-symbols=ignore-all" ${${configname}_LIBRARIES})
+   if( TARGET ${configname} )
+     set_target_properties( ${configname} PROPERTIES LINK_FLAGS ${LINK_UNRESOLVED} )
+   else()
+     set(${configname}_LIBRARIES ${LINK_UNRESOLVED} ${${configname}_LIBRARIES})
+   endif()
  endmacro()
 
 #
@@ -295,34 +305,13 @@ endif()
 # Find Qwt, correlated to the Qt version.
 #
  macro(setup_qwt)
-   if(WITH_QT4)
-     find_path(QWT_INCLUDE_DIR NAMES         qwt.h
-                               PATHS         /usr/include/qwt-qt4
-                                             /opt/local/libexec/qt4/include
-                                             /usr/include/qt4
-                                             /usr/include
-                               PATH_SUFFIXES qwt )
-     find_library(QWT_LIBRARY NAMES qwt-qt4 qwt
-                              PATHS /opt/local/libexec/qt4/lib
-                                    /usr/lib64
-				    /usr/lib )
-   else()
-     find_path(QWT_INCLUDE_DIR NAMES         qwt.h
-                               PATHS         /usr/include/qt5
-                                             /usr/include
-                               PATH_SUFFIXES qwt )
-     find_library(QWT_LIBRARY NAMES qwt-qt5 qwt
-                              PATHS /usr/lib64
-			            /usr/lib )
-   endif()
-
-   if( QWT_INCLUDE_DIR AND QWT_LIBRARY)
-     set(QWT_FOUND TRUE)
-   endif()
-
+   find_package(PkgConfig)
+   pkg_search_module(QWT REQUIRED Qt5Qwt6)
    if(QWT_FOUND)
+     set( QWT_LIBRARY ${QWT_LINK_LIBRARIES} )
+     set( QWT_INCLUDE_DIR ${QWT_CFLAGS} )
      if(NOT QWT_FIND_QUIETLY)
-       message(STATUS "-- Found Qwt: ${QWT_LIBRARY}")
+       message(STATUS "-- Found Qwt: libs:${QWT_LIBRARY} cflags:${QWT_INCLUDE_DIR}")
      endif()
    else()
      if(QWT_FIND_REQUIRED)
@@ -425,12 +414,12 @@ endif()
      list( GET clibSpec 2 soversion )
      set( pyDeplibs ${clib} ${deplibs} )
 
-             add_library( ${clib}      ${pyCpps} ) 
-   set_target_properties( ${clib}      PROPERTIES VERSION ${version} SOVERSION ${soversion})
-   #target_compile_definitions( ${clib} PUBLIC Py_LIMITED_API=1)
-   target_link_libraries( ${clib}      ${deplibs} )
+     add_library( ${clib} ${pyCpps} ) 
+     set_target_properties( ${clib}      PROPERTIES VERSION ${version} SOVERSION ${soversion})
+     #target_compile_definitions( ${clib} PUBLIC Py_LIMITED_API=1)
+     target_link_libraries( ${clib}      ${deplibs} )
+     set_has_unresolved_symbols( ${clib} )
                  install( TARGETS      ${clib}  DESTINATION lib${LIB_SUFFIX} )
-     target_link_options( ${clib} PRIVATE "LINKER:--unresolved-symbols=ignore-all")
    endif()
 
                      set( pytarget     "${pymodule}_target" )
@@ -443,8 +432,7 @@ endif()
                         )
 		#target_compile_definitions( ${pytarget} PUBLIC Py_LIMITED_API=1)
    target_link_libraries( ${pytarget}  ${pyDeplibs} )
-   target_link_options( ${pytarget} PRIVATE "LINKER:--unresolved-symbols=ignore-all")
-
+   set_has_unresolved_symbols( ${pytarget} )
                  install( TARGETS      ${pytarget}    DESTINATION ${Python_CORIOLISARCH} )
    if( NOT ("${pyIncludes}" STREQUAL "None") )
                  install( FILES        ${pyIncludes}  DESTINATION ${inc_install_dir} )
@@ -466,6 +454,7 @@ endif()
              add_library( ${pymodule}  MODULE ${pyCpps} ) 
    set_target_properties( ${pymodule}  PROPERTIES PREFIX "" )
    target_link_libraries( ${pymodule}  ${deplibs} )
+   set_has_unresolved_symbols( ${pymodule} )
    # target_compile_definitions( ${pymodule} PUBLIC Py_LIMITED_API=1)
 
                  install( TARGETS      ${pymodule}    DESTINATION ${Python_CORIOLISARCH} )

bootstrap/cmake_modules/FindLEFDEF.cmake

@@ -29,15 +29,7 @@
 #  The LEF C++ API library (zlib) : LEFDEF_ZLEF_LIBRARY
 #                                   LEFDEF_ZLEF_LIBRARY_RELEASE
 
-# Try to find a reasonable CORIOLIS_TOP value.
- if( NOT("$ENV{CORIOLIS_USER_TOP}" STREQUAL "") )
-   set ( CORIOLIS_USER_TOP "$ENV{CORIOLIS_USER_TOP}" )
- else( NOT("$ENV{CORIOLIS_USER_TOP}" STREQUAL "") )
-   if( NOT("$ENV{CORIOLIS_TOP}" STREQUAL "") )
-     set ( CORIOLIS_TOP "$ENV{CORIOLIS_TOP}" )
-   endif( NOT("$ENV{CORIOLIS_TOP}" STREQUAL "") )
- endif( NOT("$ENV{CORIOLIS_USER_TOP}" STREQUAL "") )
-
+  SETUP_SEARCH_DIR(CORIOLIS)
 
  macro( _find_lefdef_lib varname libname )
    find_library( LEFDEF_${varname}_LIBRARY_RELEASE NAMES ${libname}       PATHS ${LEFDEF_LIBRARY_DIR} )
@@ -66,21 +58,6 @@
 # Don't even bother under Win32
  if( UNIX )
    set( LEFDEF_FOUND "YES" )
-   set( LEFDEF_SEARCH_PATH "$ENV{CORIOLIS_TOP}"
-                           "$ENV{LEFDEF_TOP}"
-                           "/usr"
-                           "/opt/lefdef-5.8"
-                           "/opt/lefdef-5.7"
-                           "/opt/lefdef-5.6"
-                           "/opt/lefdef"
-                           "$ENV{HOME}/oa/lefdef/5.7-s038"
-                           "/soc/oa"
-                           )
-   message( "-- Components of LEFDEF_DIR_SEARCH:" )
-   foreach( PATH ${LEFDEF_SEARCH_PATH} )
-     message( "--   ${PATH}" )
-   endforeach()
- 
    set( LEFDEF_LIBRARIES           "" )
    set( LEFDEF_LIBRARY_SEARCH_PATH "" )
 
@@ -90,10 +67,14 @@
                                  DOC "The ${LEFDEF_INCLUDE_DIR_DESCRIPTION}" )
    message( STATUS "LEFDEF_INCLUDE_DIR: ${LEFDEF_INCLUDE_DIR}" )
 
-   find_path( LEFDEF_LIBRARY_DIR NAMES "libdef.so"
-                                 PATHS ${LEFDEF_SEARCH_PATH}
-                                 PATH_SUFFIXES "lib64" "lib"
-                                 DOC "The ${LEFDEF_LIBRARY_DIR_DESCRIPTION}" )
+  FIND_LIBRARY( LEFDEF_LIBRARY_DIR
+    NAMES def
+    PATHS ${CORIOLIS_DIR_SEARCH}
+    PATH_SUFFIXES lib64 lib
+    # Help the user find it if we cannot.
+    DOC "${LEFDEF_LIBRARY_DIR_DESCRIPTION}"
+  )
+
    message( STATUS "LEFDEF_LIBRARY_DIR: ${LEFDEF_LIBRARY_DIR}" )
 
    if( LEFDEF_INCLUDE_DIR AND LEFDEF_LIBRARY_DIR )

bootstrap/cmake_modules/FindQwt.cmake

@@ -4,37 +4,52 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 #
-# Once run this will define: 
-# 
+# Once run this will define:
+#
 # QWT_FOUND       = system has QWT lib
 # QWT_LIBRARY     = full path to the QWT library
-# QWT_INCLUDE_DIR = where to find headers 
+# QWT_INCLUDE_DIR = where to find headers
 #
 
 
+set(QWT_LIBRARY_NAMES qwt-${QT_VERSION_BASE_LOWER} qwt qwt5)
+
+find_library(QWT_LIBRARY
+  NAMES ${QWT_LIBRARY_NAMES}
+  PATHS
+    /usr/lib
+    /usr/local/lib
+    /usr/local/lib/${QT_VERSION_BASE_LOWER}
+    "$ENV{HOMEBREW_PREFIX}/opt/qwt-qt5/lib"
+    "$ENV{LIB_DIR}/lib"
+    "$ENV{LIB}"
+)
+
+set(_qwt_fw)
+if(QWT_LIBRARY MATCHES "/qwt.*\\.framework")
+  string(REGEX REPLACE "^(.*/qwt.*\\.framework).*$" "\\1" _qwt_fw "${QWT_LIBRARY}")
+endif()
+
 FIND_PATH(QWT_INCLUDE_DIR NAMES qwt.h PATHS
+  "${_qwt_fw}/Headers"
   /usr/include
-  /usr/include/qt5
+  /usr/include/${QT_VERSION_BASE_LOWER}
   /usr/local/include
-  "$ENV{LIB_DIR}/include" 
-  "$ENV{INCLUDE}" 
-  PATH_SUFFIXES qwt-qt4 qwt qwt5
-  )
-
-FIND_LIBRARY(QWT_LIBRARY NAMES qwt qwt5 qwt-qt4 qwt5-qt4 PATHS 
-  /usr/lib
-  /usr/local/lib
-  "$ENV{LIB_DIR}/lib" 
-  "$ENV{LIB}/lib" 
-  )
+  /usr/local/include/${QT_VERSION_BASE_LOWER}
+  "$ENV{LIB_DIR}/include"
+  "$ENV{INCLUDE}"
+  PATH_SUFFIXES qwt-${QT_VERSION_BASE_LOWER} ${QT_VERSION_BASE_LOWER}/qwt qwt qwt5
+)
 
 IF (QWT_INCLUDE_DIR AND QWT_LIBRARY)
   SET(QWT_FOUND TRUE)
 ENDIF (QWT_INCLUDE_DIR AND QWT_LIBRARY)
 
 IF (QWT_FOUND)
+  FILE(READ ${QWT_INCLUDE_DIR}/qwt_global.h qwt_header)
+  STRING(REGEX REPLACE "^.*QWT_VERSION_STR +\"([^\"]+)\".*$" "\\1" QWT_VERSION_STR "${qwt_header}")
   IF (NOT QWT_FIND_QUIETLY)
-    MESSAGE(STATUS "Found Qwt: ${QWT_LIBRARY}")
+    MESSAGE(STATUS "Found Qwt: ${QWT_LIBRARY} (${QWT_VERSION_STR})")
   ENDIF (NOT QWT_FIND_QUIETLY)
 ELSE (QWT_FOUND)
   IF (QWT_FIND_REQUIRED)

bora/CMakeLists.txt

@@ -17,9 +17,8 @@
  set_cmake_policies()
  setup_boost(program_options)
  setup_qt()
- setup_qwt()
  setup_python()
- 
+ find_package(Qwt                REQUIRED)
  find_package(Libexecinfo        REQUIRED)
  find_package(PythonSitePackages REQUIRED)
  find_package(LEFDEF             REQUIRED)
@@ -29,7 +28,6 @@
  find_package(ANABATIC           REQUIRED)
  find_package(KATANA             REQUIRED)
  find_package(Doxygen)
- 
  add_subdirectory(src)
  add_subdirectory(python)
 #add_subdirectory(cmake_modules)

bora/src/CMakeLists.txt

@@ -7,9 +7,9 @@
                         ${HURRICANE_INCLUDE_DIR} 
                         ${CONFIGURATION_INCLUDE_DIR} 
                         ${Boost_INCLUDE_DIRS}
-                        ${QWT_INCLUDE_DIR}
                         ${QtX_INCLUDE_DIRS}
                         ${Python_INCLUDE_DIRS}
+                        ${QWT_INCLUDE_DIR}
                       )
                    set( includes     bora/Constants.h
                                      bora/ParameterRange.h
@@ -98,16 +98,17 @@
                                      ${FLUTE_LIBRARIES}
                                      ${LEFDEF_LIBRARIES}
                                      ${OA_LIBRARIES}
-                                     ${QWT_LIBRARY}
                                      ${QtX_LIBRARIES}
                                      ${Boost_LIBRARIES}
+                                     ${QWT_LIBRARY}
                                       -lutil
                       )
 
            add_library( bora         ${cpps} ${mocCpps} ${pyCpps} )
  set_target_properties( bora         PROPERTIES VERSION 1.0 SOVERSION 1 )
  target_link_libraries( bora         ${depLibs} )
 
+
      add_python_module( "${pyCpps}"
                         "${pyIncludes}"
                         "pybora;1.0;1"

builder.py

@@ -53,6 +53,7 @@ def validate_cmake(self) -> None:
                     raise RuntimeError("CMake >= 3.1.0 is required on Windows")
 
     def build_cmake_extension(self, ext: CMakeExtension) -> None:
+        print(f"Building: {ext.name}") 
         extdir = os.path.abspath(os.path.dirname(self.get_ext_fullpath(ext.name)))
         cmake_args = []
 
@@ -76,6 +77,7 @@ def build_cmake_extension(self, ext: CMakeExtension) -> None:
         install_dir = os.path.join(extdir, 'coriolis')
         os.makedirs(build_dir,exist_ok=True)
 
+        cmake_args += ["-Wno-dev"]
         if "USE_CCACHE" in env:
             cmake_args += ["-DCMAKE_CXX_COMPILER_LAUNCHER=ccache"]
 
@@ -86,8 +88,10 @@ def build_cmake_extension(self, ext: CMakeExtension) -> None:
         cmake_args += [f"-DPython_CORIOLISARCH={install_dir}"]
         cmake_args += [f"-DSYS_CONF_DIR={install_dir}"]
         cmake_args += [f"-DCORIOLIS_TOP={install_dir}"]
+        cmake_args += [f"-DCORIOLIS_DIR_SEARCH={install_dir}"]
         cmake_args += [f"-DCORIOLIS_USER_TOP={install_dir}"]
         cmake_args += [f"-DUSE_MANYLINUX=TRUE"]
+        cmake_args += ["-DCMAKE_VERBOSE_MAKEFILE=ON"]
 
         cmake_args += [f"-DPython_EXECUTABLE={sys.executable}"]
 
@@ -96,7 +100,7 @@ def build_cmake_extension(self, ext: CMakeExtension) -> None:
         cmake_args += ["-DBUILD_DOC=TRUE"]
         cmake_args += ["-DCMAKE_BUILD_RPATH_USE_ORIGIN=1"]
         cmake_args += ["-DCMAKE_SKIP_BUILD_RPATH=FALSE"]
-        cmake_args += ["-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE"]
+        cmake_args += ["-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE"]
         cmake_args += ["-DCMAKE_INSTALL_RPATH='$ORIGIN/lib:$ORIGIN'"]
         cmake_args += ["-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE"]
 

flute/CMakeLists.txt

@@ -19,6 +19,7 @@
  setup_python()
 
  find_package(PythonSitePackages REQUIRED)
+ find_package(Boost              REQUIRED)
  find_package(HURRICANE          REQUIRED)
  find_package(CORIOLIS           REQUIRED)
 

flute/src/3.1/CMakeLists.txt

@@ -5,6 +5,7 @@
                         ${HURRICANE_INCLUDE_DIR}
                         ${CONFIGURATION_INCLUDE_DIR} 
                         ${Python_INCLUDE_DIRS}
+                        ${Boost_INCLUDE_DIRS}
                       )
 
                    set( includes      flute.h
@@ -34,6 +35,7 @@
                                       ${HURRICANE_LIBRARIES}
                                       ${UTILITIES_LIBRARY}
                                       ${Python3_LIBRARIES}
+                                      ${Boost_LIBRARIES}
 
                                       -lutil
                       )

hurricane/doc/hurricane/CMakeLists.txt

@@ -13,8 +13,8 @@
                        && ${DOXYGEN_EXECUTABLE} doxyfile
                        && cp -f ${doxExtras} html
                      )
- endif()
 
            install ( DIRECTORY html/                DESTINATION ${htmlInstallDir} )
            install ( DIRECTORY latex/               DESTINATION ${latexInstallDir} )
            install ( FILES     asimbook.cls         DESTINATION ${latexInstallDir} )
+ endif()