Fix compile issues with Qt5.15 and Boost 1.75

.github/workflows/build.yml

@@ -0,0 +1,205 @@
+---
+name: Scram
+on:
+  push:
+  pull_request:
+  page_build:
+  workflow_dispatch:
+
+env:
+# choose boost version carefully, because it might be that the version is not supported
+# by the windows version (https://stackoverflow.com/questions/12484894/what-do-i-do-about-batch-recursion-exceeds-stack-limits-when-running-boost-bui)
+  BOOST_VERSION: 1.78.0
+  BOOST_PATH: ${{github.workspace}}/boost/boost
+  WIN_PLATFORM_VERSION: 2019
+
+jobs:
+  build:
+    runs-on: ${{ matrix.env.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        env:
+          - name: linux
+            os: ubuntu-latest
+            ninja_platform: linux
+            qt_platform: linux
+            openssl_arch: linux-x86_64
+            cmake_env: {}
+            boost_toolset: gcc
+            pack: 1
+            CMAKE_FLAGS: -DCMAKE_INSTALL_PREFIX=/home/runner/scram_install
+            libxml2_install_path: /home/runner/scram_install
+            boost_install_path: /home/runner/work/scram
+
+          #- name: mac
+            #os: macos-latest
+            #ninja_platform: mac
+            #qt_platform: mac
+            #openssl_arch: darwin64-x86_64-cc
+            #cmake_env: {}
+            #pack: 1
+            #boost_toolset: clang
+
+          - name: win64
+            os: windows-latest
+            ninja_platform: win
+            qt_platform: windows
+            qt_arch: win64_mingw81
+            openssl_arch: VC-WIN64A
+            msvc_arch: x64
+            cmake_env: {}
+            #  CC: cl
+            #  CXX: cl
+            pack: 1
+            boost_toolset: mingw
+            libxml2_install_path: D:/a/scram/libxml2
+            boost_install_path: D:/a/scram
+
+    steps:
+      - name: Configure development build
+        if: github.ref_type != 'tag'
+        uses: allenevans/set-env@c4f231179ef63887be707202a295d9cb1c687eb9
+        with:
+          CMAKE_FLAGS: "-DDEV_BUILD=${{ github.ref_name }}"
+
+      - name: Checkout repository
+        uses: actions/checkout@v1
+
+      - name: Initialize Submodules
+        uses: snickerbockers/submodules-init@v4
+
+      # - name: Install Perl
+      #   if: matrix.env.ninja_platform == 'win'
+      #   uses: shogo82148/actions-setup-perl@v1
+      #   with:
+      #     perl-version: '5.30'
+
+      - name: Install Ninja
+        uses: seanmiddleditch/gha-setup-ninja@v3
+        with:
+          version: 1.9.0
+          platform: ${{ matrix.env.ninja_platform }}
+          destination: ninja
+
+      - name: Set up MinGW
+        if: matrix.env.ninja_platform == 'win'
+        uses: egor-tensin/setup-mingw@v2
+        with:
+          platform: ${{ matrix.env.msvc_arch }}
+
+      - name: Cache Boost
+        uses: actions/cache@v2
+        with:
+          path: '${{ runner.workspace }}/boost_*.tar.gz'
+          key: 'boost-${{env.BOOST_VERSION}}'
+
+      - name: Build Boost
+        # This won't re-download the archive unnecessarily:
+        uses: egor-tensin/build-boost@v1
+        with:
+          version: ${{env.BOOST_VERSION}}
+          libraries: program_options filesystem system random
+          toolset: ${{ matrix.env.boost_toolset}}
+          #directory: ${{ matrix.env.boost_install_path }}
+
+      - name: Install libxml2
+        run: |
+          git clone https://github.com/GNOME/libxml2.git
+          cd libxml2
+          mkdir -p build
+          cd build
+          cmake -G Ninja -D CMAKE_BUILD_TYPE=Release -D LIBXML2_WITH_PYTHON=OFF -D LIBXML2_WITH_ICONV=OFF -D LIBXML2_WITH_LZMA=OFF -D LIBXML2_WITH_ZLIB=OFF -DCMAKE_INSTALL_PREFIX=${{ matrix.env.libxml2_install_path }} ..
+          ninja install
+
+      - name: Install Qt
+        uses: jurplel/[email protected]
+        timeout-minutes: 10
+        with:
+          version: 5.15.2
+          target: desktop
+          host: ${{ matrix.env.qt_platform }}
+          arch: ${{ matrix.env.qt_arch }}
+          install-deps: true
+          #modules: qtwebengine
+
+      # - name: Build Jemalloc
+      #   if: matrix.env.ninja_platform == 'linux'
+      #   run: |
+      #     git clone https://github.com/jemalloc/jemalloc.git
+      #     cd jemalloc
+      #     ./autogen.sh
+      #     make
+      #     make install
+      - name: Build Information
+        run: |
+          echo "ninja version: $(ninja --version)"
+          git --version
+          qmake --version
+          cmake --version
+
+      - name: Configure Release
+        if: matrix.env.ninja_platform == 'win'
+        env: ${{ matrix.env.cmake_env }}
+        # only windows!!!
+        run: |
+          $Env:PKG_CONFIG_PATH += ";D:/a/scram/libxml2/lib/pkgconfig"
+          mkdir -p build/release
+          cd build/release
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=ON -DWITH_TCMALLOC=OFF -DWITH_JEMALLOC=OFF -DWITH_COVERAGE=OFF -DWITH_PROFILE=OFF -DPACKAGE=ON -D "BOOST_ROOT=${{ matrix.env.boost_install_path }}/boost" -D "BOOST_LIBRARYDIR=${{ matrix.env.boost_install_path }}/boost/stage/x64/Release/lib" ${{ env.CMAKE_FLAGS }} ../..
+
+      - name: Configure Release
+        if: matrix.env.ninja_platform == 'linux'
+        env: ${{ matrix.env.cmake_env }}
+        # only linux!!!
+        run: |
+          mkdir -p build/release
+          cd build/release
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=ON -DWITH_TCMALLOC=OFF -DWITH_JEMALLOC=OFF -DWITH_COVERAGE=OFF -DWITH_PROFILE=OFF -DPACKAGE=ON -D "BOOST_ROOT=${{ matrix.env.boost_install_path }}/boost" -D "BOOST_LIBRARYDIR=${{ matrix.env.boost_install_path }}/boost/stage/x64/Release/lib" ${{ env.CMAKE_FLAGS }} ../..
+
+      - name: Build
+        run: |
+          cd build/release
+          ninja
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=ON -DWITH_TCMALLOC=OFF -DWITH_JEMALLOC=OFF -DWITH_COVERAGE=OFF -DWITH_PROFILE=OFF -DPACKAGE=ON -D "BOOST_ROOT=${{ matrix.env.boost_install_path }}/boost" -D "BOOST_LIBRARYDIR=${{ matrix.env.boost_install_path }}/boost/stage/x64/Release/lib" ${{ env.CMAKE_FLAGS }} ../..
+          ninja package
+
+      - name: Publish build artifacts
+        if: matrix.env.pack
+        uses: actions/upload-artifact@v2
+        with:
+          path: ${{github.workspace}}/build/release/SCRAM*
+          name: Scram ${{ matrix.env.name }}
+
+      # - name: Test
+      #   # TODO: Re-Enable this when https://github.com/actions/runner/issues/1206 gets resolved
+      #   if: matrix.env.ninja_platform != 'win'
+      #   continue-on-error: true
+      #   run: |
+      #     cd build/release
+      #     ninja check
+
+  prerelease:
+    # https://github.com/marvinpinto/actions/issues/177
+    needs: [build] # flatpak
+    runs-on: ubuntu-latest # does not matter which
+    if: ${{ github.ref == 'refs/heads/master' }}
+
+    steps:
+      - name: Download artifacts
+        uses: actions/download-artifact@v2
+        with:
+          path: artifacts
+
+      - name: Update GitHub prerelease
+        if: ${{ github.ref == 'refs/heads/master' }}
+        uses: marvinpinto/action-automatic-releases@latest
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          automatic_release_tag: latest
+          prerelease: true
+          title: "Latest Build"
+          files: |
+            **/artifacts/Scram win64/Scram*.exe
+            **/artifacts/Scram win32/Scram*.exe
+...

CMakeLists.txt

@@ -1,5 +1,5 @@
 # vim: set foldmarker={{{,}}} foldlevel=0 foldmethod=marker:
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.21) # IMPORTED_RUNTIME_ARTIFACTS used to install
 
 # In-source build prevention.
 set(CMAKE_DISABLE_SOURCE_CHANGES ON)
@@ -40,7 +40,7 @@ endfunction()
 add_definitions(-DPROJECT_SOURCE_DIR="${PROJECT_SOURCE_DIR}")  # Needed to print file paths.
 
 # Proactively disable warnings in case Wall/Wextra are enabled outside.
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-compare -Wno-missing-field-initializers")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 
 # Strict debug flags for SCRAM targets (opt-in, must subscribe to quality checks explicitly).
 # NOTE: This is a list unlike CMAKE_CXX_FLAGS.
@@ -158,8 +158,9 @@ if(NOT WIN32)
   set(Boost_USE_MULTITHREADED OFF)
 endif()
 
+set(BOOST_COMPONENTS program_options filesystem system random)
 find_package(Boost ${BOOST_MIN_VERSION} REQUIRED COMPONENTS
-  program_options filesystem system random
+  ${BOOST_COMPONENTS}
   )
 message(STATUS "Boost Include directory: ${Boost_INCLUDE_DIR}")
 message(STATUS "Boost Library directories: ${Boost_LIBRARY_DIRS}")
@@ -218,6 +219,7 @@ if(PACKAGE)
     # The following configuration assumes MinGW64 is setup specifically for this project.
     get_filename_component(MINGW_DLL_DIR "${CMAKE_CXX_COMPILER}" PATH)
     message(STATUS "MinGW bin location: ${MINGW_DLL_DIR}")
+	message(STATUS "CMAKE_RUNTIME_OUTPUT_DIRECTORY: ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
     include(ScramBundle)
     get_scram_prerequisites(SCRAM_PREREQUISITES
       "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/scram.exe" "${MINGW_DLL_DIR}")
@@ -231,6 +233,16 @@ if(PACKAGE)
       ${SCRAM_GUI_PREREQUISITES}
       DESTINATION bin COMPONENT libraries
     )
+
+	get_target_property(libxml2_imported_location LibXml2::LibXml2 IMPORTED_LOCATION)
+	message(STATUS "XX libxml2_imported_location ${libxml2_imported_location}")
+	string(REPLACE "/lib/" "/bin/" libxml2_imported_location ${libxml2_imported_location})
+	message(STATUS "XX libxml2_imported_location2 ${libxml2_imported_location}")
+	string(REPLACE ".dll.a" ".dll" libxml2_imported_location ${libxml2_imported_location})
+	message(STATUS "XX libxml2_imported_location3 ${libxml2_imported_location}")
+
+	install(FILES ${libxml2_imported_location} DESTINATION bin COMPONENT libraries)		
+
   endif()
 endif()
 

Dockerfile

@@ -1,19 +1,16 @@
 FROM ubuntu:18.04
 ENV BUILD_PACKAGES \
-    make cmake g++ libxml2-dev \
-    libgoogle-perftools-dev libboost-program-options-dev \
-    libboost-math-dev libboost-random-dev libboost-filesystem-dev \
-    libboost-date-time-dev
+    make cmake g++ libxml2-dev libgoogle-perftools-dev libboost-program-options-dev libboost-math-dev libboost-random-dev libboost-filesystem-dev libboost-date-time-dev qt5-default libqt5gui5 libqt5opengl5 libqt5concurrent5 libqt5printsupport5 libqt5svg5-dev qttools5-dev-tools qttools5-dev libqt5opengl5-dev
 ENV RUNTIME_PACKAGES \
     libxml2 libboost-filesystem1.65.1 libboost-program-options1.65.1 \
     libtcmalloc-minimal4
 ADD . scram/
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends $BUILD_PACKAGES && \
-    cd scram && mkdir -p build && cd build && \
-    cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=OFF && make install && \
-    cd ../.. && rm -rf ./scram && \
-    apt-get remove --purge -y $BUILD_PACKAGES $(apt-mark showauto) && \
-    apt-get install -y --no-install-recommends $RUNTIME_PACKAGES && \
-    rm -rf /var/lib/apt/lists/*
-ENTRYPOINT ["scram"]
+    apt-get install -y --no-install-recommends $BUILD_PACKAGES
+RUN cd scram && mkdir -p build && cd build
+RUN cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_GUI=ON && make install 
+RUN cd ../.. && rm -rf ./scram
+RUN apt-get remove --purge -y $BUILD_PACKAGES $(apt-mark showauto) && \
+    apt-get install -y --no-install-recommends $RUNTIME_PACKAGES
+RUN rm -rf /var/lib/apt/lists/*
+#ENTRYPOINT ["scram"]

cmake/ScramBundle.cmake

@@ -4,8 +4,10 @@ macro(get_scram_prerequisites  _output _executable _search_path)
   message(STATUS "${_executable} dependency libs:\n${_all_prerequisites}")
   foreach(item ${_all_prerequisites})
     string(REGEX MATCH "scram" is_scram "${item}")
-    if(NOT is_scram)
-      gp_resolve_item("${_search_path}" "${item}" "" "" item)
+	string(REGEX MATCH "libboost" is_boost "${item}")
+	string(REGEX MATCH "libxml2" is_libxml2 "${item}")
+    if(NOT is_scram AND NOT is_boost AND NOT is_libxml2)
+	  gp_resolve_item("${_search_path}" "${item}" "" "" item)
       list(APPEND ${_output} ${item})
     endif()
   endforeach()

gui/CMakeLists.txt

@@ -90,12 +90,26 @@ set(SCRAM_GUI_SRC
   diagramview.cpp
   diagram.cpp
   mainwindow.cpp
+  messagebox.cpp
   )
+
+# To show the ui files in qtcreator
+qt_wrap_ui(SCRAM_GUI_UI
+	eventdialog.ui
+	mainwindow.ui
+	messagebox.ui
+	namedialog.ui
+	preferencesdialog.ui
+	settingsdialog.ui
+	startpage.ui
+	)
+
 ### End SCRAM GUI source list ### }}}
-add_library(scram-gui STATIC ${SCRAM_GUI_SRC})
+add_library(scram-gui STATIC ${SCRAM_GUI_SRC} ${SCRAM_GUI_UI})
+set(QT_MODULES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Svg Qt5::OpenGL Qt5::PrintSupport Qt5::Concurrent)
 target_link_libraries(scram-gui
   ${LIBS} scram
-  Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Svg Qt5::OpenGL Qt5::PrintSupport Qt5::Concurrent)
+  ${QT_MODULES})
 target_compile_options(scram-gui PUBLIC $<$<CONFIG:DEBUG>:${SCRAM_CXX_FLAGS_DEBUG} -Wno-useless-cast>) # TODO: MOC failure.
 # Prevent implicit QString(const char*), string concat with "+", and other anti-patterns.
 target_compile_definitions(scram-gui PRIVATE
@@ -157,6 +171,52 @@ if(PACKAGE)
       FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
       DESTINATION bin
       COMPONENT gui)
+
+
+	#set_target_properties(scram-gui PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+	# Rpath exists only on Unix systems. The libraries must be in the same location than the binary
+	#message(STATUS "XX BOOST LIBRARIES ${Boost_LIBRARIES}")
+	#install(
+	#	FILES ${Boost_LIBRARIES}
+	#	DESTINATION bin
+	#	COMPONENT gui)
+	#foreach(boost_component ${BOOST_COMPONENTS})
+	#	install(IMPORTED_RUNTIME_ARTIFACTS Boost::${boost_component})
+	#endforeach()
+
+	foreach(BOOST_COMPONENT ${BOOST_COMPONENTS})
+		get_target_property(BOOST_LIB Boost::${BOOST_COMPONENT} LOCATION_${CMAKE_BUILD_TYPE})
+
+		get_target_property(boost_imported_location Boost::${BOOST_COMPONENT} IMPORTED_LOCATION)
+		message(STATUS "XX boost_imported_location ${boost_imported_location}")
+		#string(REPLACE "/lib/" "/bin/" boost_imported_location ${boost_imported_location})
+		#message(STATUS "XX boost_imported_location2 ${boost_imported_location}")
+		string(REPLACE ".dll.a" ".dll" boost_imported_location ${boost_imported_location})
+		message(STATUS "XX boost_imported_location ${boost_imported_location}")
+
+		message(STATUS "XX Boost::${BOOST_COMPONENT} LIB: ${BOOST_LIB}")
+		install(FILES ${boost_imported_location}
+        DESTINATION bin
+        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+        GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+        COMPONENT gui
+        #RENAME ${TARGET_NAME}
+      )
+	endforeach()
+
+	foreach(QT_MODULE ${QT_MODULES})
+		get_target_property(QT_LIBRARY ${QT_MODULE} LOCATION_${CMAKE_BUILD_TYPE})
+
+		install(FILES ${QT_LIBRARY}
+        DESTINATION bin
+        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+        GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+        COMPONENT gui
+        #RENAME ${TARGET_NAME}
+      )
+	endforeach()
+
+
   endif()
 endif()
 ###################### End CPACK configurations ############################# }}}