remove boost from automated download, use last version of wxwidgets

Author: nicolas-f

Diff for: .github/workflows/cmake.yml

@@ -26,6 +26,7 @@ jobs:
           sudo sed -i 's/azure\.//' /etc/apt/sources.list 
           sudo apt-get update 
           sudo apt-get install -y --no-install-recommends \
+          build-essential \
           libgtk-3-dev \
           freeglut3-dev \
           libxmu-dev \
@@ -41,7 +42,11 @@ jobs:
           libgl1-mesa-dev \
           libglapi-mesa \
           byacc \
-          gettext
+          gettext \
+          cmake \
+          python3-dev \
+          swig \
+          libboost-all-dev
       - name: Cache CPM dependency packages
         uses: actions/cache@v3
         with:
@@ -56,16 +61,18 @@ jobs:
           cmake -DCPM_SOURCE_CACHE=${{ env.CPM_SOURCE_CACHE }} -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
 
       - name: Build
+        working-directory: ${{github.workspace}}/build
         # Compile i-simpa
-        run: cd build && make
+        run: make
 
       - name: Install
+        working-directory: ${{github.workspace}}/build
         # Copy stuff to bin subdirectory for "standalone" application
-        run: cd build && make install
+        run: make install
 
       - name: Test
         working-directory: ${{github.workspace}}/build
         # Execute tests defined by the CMake configuration.
         # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-        run: cd build && make test
+        run: make test
 

Diff for: CMakeLists.txt

@@ -75,12 +75,6 @@ cmake_policy(SET CMP0086 NEW)
 cmake_policy(SET CMP0078 NEW)
 cmake_policy(SET CMP0074 NEW)
 
-# configure boost for inclusion in builds
-
-set(BOOST_INCLUDE_LIBRARIES system python filesystem regex algorithm thread test random)
-set(BOOST_ENABLE_PYTHON ON)
-
-
 # Command to output information to the console
 # Useful for displaying errors, warnings, and debugging
 message (STATUS "cxx Flags: " ${CMAKE_CXX_FLAGS})

Diff for: src/isimpa/CMakeLists.txt

@@ -386,47 +386,9 @@ set_property(SOURCE data_manager/python_interface/py_ui_module/element_pywrap.cp
 
 configure_file(data_manager/appconfig_version.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/generated/appconfig_version.cpp )
 
-CPMAddPackage(
-  NAME Boost
-  VERSION 1.81.0
-  GITHUB_REPOSITORY "boostorg/boost"
-  GIT_TAG "boost-1.81.0"
-)
-
-# add wxWidgets as dependency
-
-find_package(wxWidgets)
-
-if(wxWidgets_FOUND)
-
-    if(CMAKE_BUILD_TYPE STREQUAL Debug)
-        if(NOT ${wxWidgets_CONFIGURATION} MATCHES .*d$ )
-        set(wxWidgets_CONFIGURATION ${wxWidgets_CONFIGURATION}d)
-        endif()
-    else()
-        if(${wxWidgets_CONFIGURATION} MATCHES .*d$ )
-        string(LENGTH ${wxWidgets_CONFIGURATION} BUILD_STR_SIZE)
-        MATH(EXPR BUILD_STR_SIZE "${BUILD_STR_SIZE}-1")
-        string(SUBSTRING ${wxWidgets_CONFIGURATION} 0 ${BUILD_STR_SIZE} wxWidgets_CONFIGURATION)
-        endif()
-    endif()
-
-    find_package(wxWidgets COMPONENTS core base xml gl aui adv html REQUIRED)
-
-    include(${wxWidgets_USE_FILE})
-else(NOT wxWidgets_FOUND)
-  set(USING_CPM true)
-  set(BUILD_SHARED_LIBS OFF)
-  set(CPM_DOWNLOAD_VERSION 0.34.0)
-
-  include(${CPM_DOWNLOAD_LOCATION})
-
-  CPMAddPackage(
-    NAME wxWidgets
-    GIT_REPOSITORY https://github.com/wxWidgets/wxWidgets
-    GIT_TAG        v3.1.6
-  )
-endif()
+set(Boost_USE_STATIC_LIBS   OFF)
+find_package(Boost REQUIRED COMPONENTS system python filesystem regex random)
+link_directories( ${Boost_LIBRARY_DIRS} )
 
 # Set Properties->General->Configuration Type to Application
 # Creates isimpa with the listed sources
@@ -477,6 +439,8 @@ IF(GETTEXT_FOUND )
   add_dependencies(isimpa pofiles)
 ENDIF()
 
+SET(wxUSE_GLCANVAS_EGL OFF)
+
 IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
     SET(wxWidgets_USE_DEBUG ON)
     SET(wxWidgets_USE_STATIC OFF)
@@ -490,19 +454,49 @@ ENDIF()
 SET(CMAKE_EXE_LINKER_FLAGS
           "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath -Wl,/usr/local/lib")
 
-#find_package(wxWidgets COMPONENTS core base xml gl aui adv html REQUIRED)
-# include(${wxWidgets_USE_FILE})
+# add wxWidgets as dependency
+
+find_package(wxWidgets)
+
+if(wxWidgets_FOUND)
+
+    if(CMAKE_BUILD_TYPE STREQUAL Debug)
+        if(NOT ${wxWidgets_CONFIGURATION} MATCHES .*d$ )
+        set(wxWidgets_CONFIGURATION ${wxWidgets_CONFIGURATION}d)
+        endif()
+    else()
+        if(${wxWidgets_CONFIGURATION} MATCHES .*d$ )
+        string(LENGTH ${wxWidgets_CONFIGURATION} BUILD_STR_SIZE)
+        MATH(EXPR BUILD_STR_SIZE "${BUILD_STR_SIZE}-1")
+        string(SUBSTRING ${wxWidgets_CONFIGURATION} 0 ${BUILD_STR_SIZE} wxWidgets_CONFIGURATION)
+        endif()
+    endif()
+
+    find_package(wxWidgets COMPONENTS core base xml gl aui adv html REQUIRED)
+
+    include(${wxWidgets_USE_FILE})
+else(NOT wxWidgets_FOUND)
+  set(USING_CPM true)
+  set(BUILD_SHARED_LIBS OFF)
+  set(CPM_DOWNLOAD_VERSION 0.34.0)
+
+  include(${CPM_DOWNLOAD_LOCATION})
+
+  CPMAddPackage(
+    NAME wxWidgets
+    GIT_REPOSITORY https://github.com/wxWidgets/wxWidgets
+    GIT_TAG        v3.2.1
+  )
+endif()
 
 # Find package for buildingfind_package(Python3 COMPONENTS Interpreter Development)
 FIND_PACKAGE(PythonLibs "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" REQUIRED)
 execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; import sysconfig; print(list(sysconfig.get_paths().values()))"
                     OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-find_package(OpenGL REQUIRED)
+FIND_PACKAGE(OpenGL REQUIRED COMPONENTS OpenGL EGL)
 include_directories(${OPENGL_INCLUDE_DIRS})
 include_directories(${wxWidgets_SOURCE_DIR})
-link_directories( ${Boost_LIBRARY_DIRS} )
-include_directories(${Boost_INCLUDE_DIRS} )
 include_directories(${PYTHON_INCLUDE_PATH})
 
 # Properties->Linker->Input->Additional Dependencies
@@ -513,7 +507,7 @@ if(WIN32 AND MSVC)
 endif()
 
 if(USING_CPM)
-    target_link_libraries(isimpa wx::core wx::base wx::aui)
+    target_link_libraries(isimpa wx::core wx::base wx::aui wx::adv wx::xml wx::html wx::gl)
 else()
     target_link_libraries(isimpa ${wxWidgets_LIBRARIES})
 endif()

Diff for: src/lib_interface/CMakeLists.txt

@@ -113,15 +113,10 @@ source_group( "tools" FILES ${TOOLS_SOURCES} )
 #    DEPENDENCY & EXECUTABLE (OR LIB)
 #---------------------------------------#
 
-# set(Boost_USE_STATIC_LIBS   OFF)
-# find_package(Boost COMPONENTS REQUIRED system filesystem regex)
-
-CPMAddPackage(
-  NAME Boost
-  VERSION 1.81.0
-  GITHUB_REPOSITORY "boostorg/boost"
-  GIT_TAG "boost-1.81.0"
-)
+set(Boost_USE_STATIC_LIBS   OFF)
+find_package(Boost COMPONENTS REQUIRED system filesystem regex)
+link_directories( ${Boost_LIBRARY_DIRS} )
+include_directories( ${Boost_INCLUDE_DIRS} )
 
 add_library(lib_interface
     ${LIBINTERFACE_SOURCES}
@@ -140,7 +135,9 @@ add_library(lib_interface
 set_property(TARGET lib_interface PROPERTY FOLDER "libraries")
 
 target_link_libraries (lib_interface
-    Boost::system Boost::filesystem Boost::regex Boost::thread Boost::algorithm)
+    ${Boost_FILESYSTEM_LIBRARY}
+    ${Boost_SYSTEM_LIBRARY}
+    ${Boost_REGEX_LIBRARY})
 
 #------------#
 #    TEST 1
@@ -155,10 +152,14 @@ file(COPY tests/speaker-test1.txt tests/speaker-test2.txt
 set(LIBINTERFACE_TESTS
     tests/balloon_test.cpp)
 
+set(Boost_USE_STATIC_LIBS   ON)
+find_package(Boost COMPONENTS regex unit_test_framework timer chrono filesystem REQUIRED)
+
 add_executable(TEST_lib_interface ${LIBINTERFACE_TESTS})
 
 target_link_libraries (TEST_lib_interface
-lib_interface Boost::system Boost::filesystem Boost::regex Boost::thread Boost::algorithm Boost::unit_test_framework)
+    lib_interface
+    ${Boost_LIBRARIES})
 
 set_property(TARGET TEST_lib_interface PROPERTY FOLDER "tests")
 
@@ -184,8 +185,9 @@ file(COPY tests/cube.cbin tests/cube_mesh.mbin tests/test_import1.poly
 add_executable(TEST_io_lib_interface tests/io_test.cpp )
 
 
-target_link_libraries (TEST_io_lib_interface lib_interface
-    lib_interface Boost::system Boost::filesystem Boost::regex Boost::thread Boost::algorithm Boost::unit_test_framework)
+target_link_libraries (TEST_io_lib_interface
+    lib_interface
+    ${Boost_LIBRARIES})
 
 
 set_property(TARGET TEST_io_lib_interface PROPERTY FOLDER "tests")

Diff for: src/python_bindings/CMakeLists.txt

@@ -13,9 +13,9 @@ FIND_PACKAGE(SWIG REQUIRED)
 INCLUDE(${SWIG_USE_FILE})
 
 # Find package for building
-FIND_PACKAGE(PythonLibs 3.10 EXACT REQUIRED)
+FIND_PACKAGE(PythonLibs REQUIRED)
 # Find package for testing
-FIND_PACKAGE(PythonInterp 3.10 EXACT REQUIRED)
+FIND_PACKAGE(PythonInterp REQUIRED)
 
 INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
 
@@ -27,18 +27,9 @@ SET(CMAKE_SWIG_FLAGS "")
 
 SET_SOURCE_FILES_PROPERTIES(libsimpa.i PROPERTIES CPLUSPLUS ON)
 
-#set(Boost_USE_STATIC_LIBS   OFF)
-#find_package(Boost COMPONENTS system filesystem regex REQUIRED)
-#link_directories( ${Boost_LIBRARY_DIRS})
-
-CPMAddPackage(
-  NAME Boost
-  VERSION 1.81.0
-  GITHUB_REPOSITORY "boostorg/boost"
-  GIT_TAG "boost-1.81.0"
-  FIND_PACKAGE_ARGUMENTS "COMPONENTS program_options"
-)
-
+set(Boost_USE_STATIC_LIBS   OFF)
+find_package(Boost COMPONENTS system filesystem regex REQUIRED)
+link_directories( ${Boost_LIBRARY_DIRS})
 
 IF (${CMAKE_VERSION} VERSION_LESS "3.8.0")
   SWIG_ADD_MODULE(libsimpa python libsimpa.i)
@@ -138,4 +129,4 @@ add_test(NAME check_retrocompat_recsurf
 
 set_property(TEST test_modelio check_retrocompat check_retrocompat_mesh check_retrocompat_gabe test_math check_retrocompat_recsurf
  PROPERTY ENVIRONMENT "PYTHONPATH=${CMAKE_INSTALL_PREFIX}"
-)
+)

Diff for: src/spps/CMakeLists.txt

@@ -54,12 +54,17 @@ source_group("" FILES ${SPPS_SOURCES} $(SPPS_MAIN_SOURCES))
 #    DEPENDENCY & EXECUTABLE (OR LIB)
 #---------------------------------------#
 
-CPMAddPackage(
-  NAME Boost
-  VERSION 1.81.0
-  GITHUB_REPOSITORY "boostorg/boost"
-  GIT_TAG "boost-1.81.0"
-)
+set(Boost_USE_STATIC_LIBS   OFF)
+
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+  find_package(Boost REQUIRED COMPONENTS system random filesystem regex)
+else()
+  find_package (Threads)
+  find_package(Boost REQUIRED COMPONENTS system random filesystem regex thread chrono date_time)
+endif()
+
+link_directories( ${Boost_LIBRARY_DIRS} )
+include_directories( ${Boost_INCLUDE_DIRS} )
 
 # Check for clock_gettime function
 if (UNIX)
@@ -87,10 +92,7 @@ set_property(TARGET spps PROPERTY FOLDER "executables")
 
 
 # Properties->Linker->Input->Additional Dependencies
-target_link_libraries (spps lib_interface)
-
-target_link_libraries (spps
-    Boost::system Boost::filesystem Boost::regex Boost::thread Boost::algorithm Boost::thread Boost::chrono Boost::date_time) 
+target_link_libraries (spps lib_interface ${Boost_LIBRARIES})
 
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -154,6 +156,9 @@ file(COPY
 set(SPPS_TESTS
     tests/spps_core_test.cpp)
 
+set(Boost_USE_STATIC_LIBS   ON)
+find_package(Boost COMPONENTS filesystem regex unit_test_framework timer chrono REQUIRED)
+
 add_executable(TEST_spps ${SPPS_TESTS}
     ${DATA_MANAGER_SOURCES}
     ${IO_SOURCES}