Switch to cmake part1

.appveyor.yml

@@ -2,7 +2,7 @@ image:
 - Visual Studio 2017
 environment:
   HOPSAN_BUILD_SCRIPT_NOPAUSE: 1
-  HOPSAN_BUILD_QT_HOME: C:\Qt\5.12.6\mingw73_64
+  HOPSAN_BUILD_QT_HOME: C:\Qt\5.13.2\mingw73_64
   HOPSAN_BUILD_MINGW_HOME: C:\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64
 platform: x64
 configuration: Release
@@ -16,12 +16,12 @@ build_script:
   - set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
   - PATH
   - cd dependencies
-  - setupDiscount.bat
-  - setupFmi4c.bat
-  - setupXerces.bat
   - setupZlib.bat
   - setupLibzip.bat
+  - setupXerces.bat
   - setupDCPLib.bat
+  - setupDiscount.bat
+  - setupFmi4c.bat
 #  - setupHDF5.bat (takes to long to build)
   - setupKatex.bat
   - setupTclap.bat
@@ -31,12 +31,15 @@ build_script:
   - setupSsp4c.bat
   - call setHopsanBuildPaths.bat
   - cd ..
-  - mkdir build
-  - cd build
-  - qmake.exe ..\HopsanNG.pro -r -spec win32-g++ CONFIG+=release
-  - cd ..
-  - mingw32-make.exe -j6 -C build
+  - cmake -G"MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install_dir -Bbuild_dir -S.
+  - cmake --build build_dir --config Release --parallel 6
+  - cmake --build build_dir --config Release --parallel 6 --target install
+  - cd install_dir
   - dir bin
+  - cd ..
 test_script:
-  - runUnitTests.bat
-  - runValidationTests.bat
+  - cd build_dir
+  - ctest -C Release --output-on-failure --parallel 4
+  - cd ..
+#  - set PATH=%CD%\install\bin;%PATH%
+#  - runValidationTests.bat TODO Fix this

.github/workflows/ci-build.yaml

@@ -2,9 +2,9 @@ name: ghactions-ci-build
 on: [pull_request]
 
 jobs:
-  cmake-msvc2019:
+  cmake-msvc2022:
     timeout-minutes: 30
-    runs-on: windows-2025
+    runs-on: windows-2022
     env:
       HOPSAN_BUILD_SCRIPT_NOPAUSE: 1
       HOPSAN_BUILD_CMAKE_GENERATOR: '"Visual Studio 17 2022"'
@@ -45,13 +45,13 @@ jobs:
         working-directory: dependencies
         run: |
             call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
-            call setupDiscount.bat
-            call setupTclap.bat
-            call setupFmi4c.bat
             call setupZlib.bat
             call setupLibzip.bat
             call setupXerces.bat
             call setupDCPLib.bat
+            call setupDiscount.bat
+            call setupFmi4c.bat
+            call setupTclap.bat
             call setupQwt.bat
             call setupSsp4c.bat
 
@@ -101,12 +101,12 @@ jobs:
         shell: bash
         working-directory: dependencies
         run: |
-          ./setupDiscount.sh
-          ./setupTclap.sh
-          ./setupFmi4c.sh
           ./setupLibzip.sh
           ./setupXerces.sh
           ./setupDCPLib.sh
+          ./setupDiscount.sh
+          ./setupFmi4c.sh
+          ./setupTclap.sh
           ./setupQwt.sh
           ./setupSsp4c.sh
 

.gitignore

@@ -2,6 +2,7 @@
 .vs/
 bin/
 HopsanNG_bd/
+build/
 output64/
 output/
 output_deb/

CMakeLists.txt

@@ -1,11 +1,13 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.10)
 project(Hopsan)
 
 cmake_policy(SET CMP0054 NEW)
-cmake_policy(SET CMP0079 NEW)
+cmake_policy(SET CMP0057 NEW)
+if (POLICY CMP0079)
+  cmake_policy(SET CMP0079 NEW)
+endif()
 
-set(HOPSANCORE_INSTALL_DST "HopsanCore")
-message(WARNING "Hopsan CMake support is still experimental, but should be  working for for GCC / MinGW and limited MSVC build")
+set(HOPSANCORE_INSTALL_DST "HopsanCore" CACHE STRING "")
 
 include(CheckCXXCompilerFlag)
 if (MINGW)
@@ -77,7 +79,7 @@ if (WIN32)
 
   if (MINGW)
     file(TO_CMAKE_PATH "$ENV{mingw_path}" mingw_home_bin)
-    if (EXISTS ${mingw_path})
+    if (EXISTS ${mingw_home_bin})
         message(STATUS "Installing from MinGW directory: ${mingw_home_bin}")
 
         install(FILES ${mingw_home_bin}/libgcc_s_seh-1.dll
@@ -87,14 +89,14 @@ if (WIN32)
 
         # Qt binaries that are only part of the mingw build
         if (EXISTS ${qt_home_bin})
-            install(FILES ${qt_home_bin}/Qt5WebKit.dll
-                          ${qt_home_bin}/Qt5WebKitWidgets.dll
-                          ${qt_home_bin}/libicuin56.dll
-                          ${qt_home_bin}/libicuuc56.dll
-                          ${qt_home_bin}/libicudt56.dll
-                          ${qt_home_bin}/libeay32.dll
-                          ${qt_home_bin}/ssleay32.dll
-                    DESTINATION bin)
+          install_files_if_they_exist(bin
+                                      ${qt_home_bin}/Qt5WebKit.dll
+                                      ${qt_home_bin}/Qt5WebKitWidgets.dll
+                                      ${qt_home_bin}/libicuin56.dll
+                                      ${qt_home_bin}/libicuuc56.dll
+                                      ${qt_home_bin}/libicudt56.dll
+                                      ${qt_home_bin}/libeay32.dll
+                                      ${qt_home_bin}/ssleay32.dll)
         endif()
     else()
         message(WARNING "Env variable mingw_path not set, not installing mingw binaries")

HopsanCLI/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+
 project(HopsanCLI)
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_DEBUG_POSTFIX _d)
@@ -9,6 +9,11 @@ file(GLOB_RECURSE hopsancli_srcfiles *.cpp *.h *.hpp)
 
 add_executable(hopsancli ${hopsancli_srcfiles})
 
+if(MSVC)
+  # Enable multi-core build with MSVC
+  target_compile_options(hopsancli PRIVATE "/MP")
+endif()
+
 target_include_directories(hopsancli PRIVATE
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../HopsanCore/dependencies/rapidxml>

HopsanCore/CMakeLists.txt

@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.1)
 project(HopsanCore)
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_DEBUG_POSTFIX _d)
@@ -7,7 +6,7 @@ if(WIN32)
 endif()
 find_package(Threads)
 
-set(HOPSANCORE_INSTALL_DST "" CACHE STRING "Hopsan source code installation relative CMAKE_INSTALL_PREFIX ")
+set(HOPSANCORE_INSTALL_DST "" CACHE STRING "Hopsan source code installation relative CMAKE_INSTALL_PREFIX")
 
 # Include dependencies functions
 include(dependencies/libnumhop.cmake)
@@ -26,6 +25,11 @@ add_indexingcsvparser_src(hopsancore)
 add_rapidxml_src(hopsancore)
 add_sundials_src(hopsancore)
 
+if(MSVC)
+  # Enable multi-core build with MSVC
+  target_compile_options(hopsancore PRIVATE "/MP")
+endif()
+
 # Set compiler definitions
 if(WIN32)
   target_compile_definitions(hopsancore PRIVATE HOPSANCORE_DLLEXPORT)
@@ -38,7 +42,11 @@ if (MSVC)
   # Undefine odd min and max macros to enable use of std::min, std::max, make it public so all projects get this define
   target_compile_definitions(hopsancore PUBLIC NOMINMAX)
 endif()
-target_compile_definitions(hopsancore PRIVATE HOPSANCORE_WRITELOG)
+if (NOT MSVC)
+  # Do not enable core logging with msvc
+  # TODO Investigate why its not working, comment from release script was "so that MSVC dlls do not try to access the log file"
+  target_compile_definitions(hopsancore PRIVATE HOPSANCORE_WRITELOG)
+endif()
 if(CMAKE_BUILD_TYPE MATCHES Debug)
   target_compile_definitions(hopsancore PUBLIC HOPSAN_BUILD_TYPE_DEBUG)
 else()

HopsanGUI/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+
 project(HopsanGUI)
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_DEBUG_POSTFIX _d)
@@ -7,9 +7,12 @@ if(WIN32)
 endif()
 
 if(WIN32)
-find_package(Qt5 COMPONENTS Core Gui Widgets Xml Svg Network Test PrintSupport REQUIRED)
+  find_package(Qt5 COMPONENTS Core Gui Widgets Xml Svg Network Test PrintSupport REQUIRED)
+  if(MINGW)
+      find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets)
+  endif()
 else()
-find_package(Qt5 COMPONENTS Core Gui Widgets Xml Svg Network Test PrintSupport WebEngineWidgets REQUIRED)
+  find_package(Qt5 COMPONENTS Core Gui Widgets Xml Svg Network Test PrintSupport WebEngineWidgets REQUIRED)
 endif()
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
@@ -18,38 +21,46 @@ include(${CMAKE_CURRENT_LIST_DIR}/../helpers.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/../dependencies/qwt.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/../dependencies/discount.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/../dependencies/katex.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/../dependencies/libzip.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/../dependencies/xerces.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/../dependencies/ssp4c.cmake)
 
-set(target_name hopsangui)
-
 file(GLOB_RECURSE srcfiles *.cpp *.h *.hpp *.qrc)
-add_executable(${target_name} ${srcfiles})
+add_executable(hopsangui ${srcfiles})
 
-target_include_directories(${target_name} PRIVATE
+if(MSVC)
+  # Enable multi-core build with MSVC
+  target_compile_options(hopsangui PRIVATE "/MP")
+endif()
+
+target_include_directories(hopsangui PRIVATE
   $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../Utilities>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../hopsandcp/include>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/libzip/include>)
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../Utilities>)
 
-target_compile_definitions(${target_name} PRIVATE _USE_MATH_DEFINES)
+target_compile_definitions(hopsangui PRIVATE _USE_MATH_DEFINES)
+target_compile_definitions(hopsangui PRIVATE DEVELOPMENT)
 if(NOT CMAKE_BUILD_TYPE MATCHES Debug)
   # Silence qDebug() for all non Debug configurations
-  target_compile_definitions(${target_name} PRIVATE QT_NO_DEBUG_OUTPUT)
+  target_compile_definitions(hopsangui PRIVATE QT_NO_DEBUG_OUTPUT)
 endif()
 
-target_link_libraries(${target_name} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml Qt5::Svg Qt5::Network Qt5::Test Qt5::PrintSupport
-    qwt hopsancore hopsangeneratorgui symhop ops hopsandcp xercesc ssp4c )
+target_link_libraries(hopsangui Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Xml Qt5::Svg Qt5::Network Qt5::Test Qt5::PrintSupport
+    qwt hopsancore hopsangeneratorgui symhop ops hopsandcp ssp4c::ssp4c)
 if(UNIX)
-target_link_libraries(${target_name} Qt5::WebEngineWidgets)
+  message(STATUS "Linking with Qt5::WebEngineWidgets")
+  target_link_libraries(hopsangui Qt5::WebEngineWidgets)
+  target_compile_definitions(hopsangui PRIVATE USEWEBENGINE)
+endif()
+# If Qt5WebKitWidgets was found, link it
+if (Qt5WebKitWidgets_DIR)
+  message(STATUS "Linking with Qt5::WebKitWidgets")
+  target_link_libraries(hopsangui Qt5::WebKitWidgets)
+  target_compile_definitions(hopsangui PRIVATE USEWEBKIT)
 endif()
 
-target_link_optional_libraries(${target_name} libhopsanremoteclient hopsanhdf5exporter discount katex)
+target_link_optional_libraries(hopsangui libhopsanremoteclient hopsanhdf5exporter discount katex)
 
-set_target_properties(${target_name} PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib")
+set_target_properties(hopsangui PROPERTIES INSTALL_RPATH "\$ORIGIN/../lib")
 
-install(TARGETS ${target_name}
+install(TARGETS hopsangui
   RUNTIME DESTINATION bin
 )
 

HopsanGUI/PlotArea.cpp

@@ -273,12 +273,20 @@ PlotArea::PlotArea(PlotTab *pParentPlotTab)
     // Legend Stuff
     mpRightPlotLegend = new PlotLegend(QwtPlot::yRight);
     mpRightPlotLegend->attach(mpQwtPlot);
+#if QWT_VERSION >= 0x060300
     mpRightPlotLegend->setAlignmentInCanvas(Qt::AlignRight | Qt::AlignTop);
+#else
+    mpRightPlotLegend->setAlignment(Qt::AlignRight | Qt::AlignTop);
+#endif
     mpRightPlotLegend->setZ(LegendBelowCurveZOrderType);
 
     mpLeftPlotLegend = new PlotLegend(QwtPlot::yLeft);
     mpLeftPlotLegend->attach(mpQwtPlot);
+#if QWT_VERSION >= 0x060300
     mpLeftPlotLegend->setAlignmentInCanvas(Qt::AlignLeft | Qt::AlignTop);
+#else
+    mpLeftPlotLegend->setAlignment(Qt::AlignLeft | Qt::AlignTop);
+#endif
     mpLeftPlotLegend->setZ(LegendBelowCurveZOrderType);
 
     constructLegendSettingsDialog();
@@ -1869,6 +1877,7 @@ void PlotArea::applyLegendSettings()
         int alignL = mpLegendLPosition->currentIndex();
         int alignR = mpLegendRPosition->currentIndex();
 
+#if QWT_VERSION >= 0x060300
         if ( alignL == 0 )
         {
             mpLeftPlotLegend->setAlignmentInCanvas(Qt::AlignTop | Qt::AlignLeft);
@@ -1894,6 +1903,33 @@ void PlotArea::applyLegendSettings()
         {
             mpRightPlotLegend->setAlignmentInCanvas(Qt::AlignVCenter | Qt::AlignRight);
         }
+#else
+        if ( alignL == 0 )
+        {
+            mpLeftPlotLegend->setAlignment(Qt::AlignTop | Qt::AlignLeft);
+        }
+        else if ( alignL == 1 )
+        {
+            mpLeftPlotLegend->setAlignment(Qt::AlignBottom | Qt::AlignLeft);
+        }
+        else
+        {
+            mpLeftPlotLegend->setAlignment(Qt::AlignVCenter | Qt::AlignLeft);
+        }
+
+        if ( alignR == 0 )
+        {
+            mpRightPlotLegend->setAlignment(Qt::AlignTop | Qt::AlignRight);
+        }
+        else if ( alignR == 1 )
+        {
+            mpRightPlotLegend->setAlignment(Qt::AlignBottom | Qt::AlignRight);
+        }
+        else
+        {
+            mpRightPlotLegend->setAlignment(Qt::AlignVCenter | Qt::AlignRight);
+        }
+#endif
 
         QColor bgColor(mpLegendBgColor->currentText());
         //bgColor.setAlpha(128);
@@ -2716,6 +2752,7 @@ void PlotArea::setSmartYAxisLimits(const QwtPlot::Axis axisId, QwtInterval axisL
 void PlotArea::calculateLegendBufferOffsets(const QwtPlot::Axis axisId, double &rBottomOffset, double &rTopOffset)
 {
     double leftLegendHeight=0, rightLegendHeight=0;
+#if QWT_VERSION >= 0x060300
     if (mpLeftPlotLegend->isVisible())
     {
         leftLegendHeight = mpLeftPlotLegend->geometry(mpQwtPlot->geometry()).height() + mpLeftPlotLegend->offsetInCanvas(Qt::Vertical);
@@ -2724,11 +2761,26 @@ void PlotArea::calculateLegendBufferOffsets(const QwtPlot::Axis axisId, double &
     {
         rightLegendHeight = mpRightPlotLegend->geometry(mpQwtPlot->geometry()).height() + mpRightPlotLegend->offsetInCanvas(Qt::Vertical);
     }
+#else
+    if (mpLeftPlotLegend->isVisible())
+    {
+        leftLegendHeight = mpLeftPlotLegend->geometry(mpQwtPlot->geometry()).height() + mpLeftPlotLegend->borderDistance();
+    }
+    if (mpRightPlotLegend->isVisible())
+    {
+        rightLegendHeight = mpRightPlotLegend->geometry(mpQwtPlot->geometry()).height() + mpRightPlotLegend->borderDistance();
+    }
+#endif
     //! @todo even if a legend is empty it seems to be visible and the borderDistance will be added, this causes unnecessary space when on top or bottom (and the other legend is not)
 
     // Figure out vertical alignment, by bitwise masking
+#if QWT_VERSION >= 0x060300
     Qt::Alignment lva = mpLeftPlotLegend->alignmentInCanvas() & Qt::AlignVertical_Mask;
     Qt::Alignment rva = mpRightPlotLegend->alignmentInCanvas() & Qt::AlignVertical_Mask;
+#else
+    Qt::Alignment lva = mpLeftPlotLegend->alignment() & Qt::AlignVertical_Mask;
+    Qt::Alignment rva = mpRightPlotLegend->alignment() & Qt::AlignVertical_Mask;
+#endif
 
     rBottomOffset = rTopOffset = 0;
     if(mpLegendsAutoOffsetCheckBox->isChecked())

HopsanGUI/Widgets/ModelWidget.h

@@ -58,7 +58,6 @@ class AnimationWidget;
 class SimulationThreadHandler;
 class GUIMessageHandler;
 class LogDataHandler2;
-class ssdHandle;
 
 #include "CoreAccess.h"
 #include "RemoteCoreAccess.h"