add fmusim-gui cmake build; also fix parallel build issue

Signed-off-by: Benstone Zhang <[email protected]>

Author: benstonezhang

Diff for: CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.17)
+cmake_minimum_required (VERSION 3.18)
 
 set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
 
@@ -33,6 +33,7 @@ if (NOT FMI_ARCHITECTURE)
 endif ()
 
 set(WITH_FMUSIM OFF CACHE BOOL "Add fmusim project")
+set(WITH_FMUSIM_GUI OFF CACHE BOOL "Add fmusim Gui project")
 
 if (MSVC)
   add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
@@ -277,6 +278,14 @@ endforeach(MODEL_NAME)
 # Examples
 include(examples/Examples.cmake)
 
-if (WITH_FMUSIM)
-  add_subdirectory(fmusim)
+if(WITH_FMUSIM OR WITH_FMUSIM_GUI)
+  include(build/external.cmake)
+
+  if (WITH_FMUSIM)
+    add_subdirectory(fmusim)
+  endif ()
+
+  if (WITH_FMUSIM_GUI)
+    add_subdirectory(fmusim-gui)
+  endif ()
 endif ()

Diff for: build/external.cmake

@@ -1,5 +1,11 @@
+cmake_host_system_information(RESULT TARGET_64_BITS QUERY IS_64BIT)
+
 include(ExternalProject)
 set(EXTERNAL_BASE_DIR ${CMAKE_BINARY_DIR}/external CACHE STRING "External base directory")
+file(MAKE_DIRECTORY ${EXTERNAL_BASE_DIR}/lib)
+if(UNIX AND TARGET_64_BITS GREATER_EQUAL 1)
+    file(CREATE_LINK lib ${EXTERNAL_BASE_DIR}/lib64 SYMBOLIC)
+endif()
 
 ExternalProject_Add(
     zlib_src
@@ -18,12 +24,10 @@ set_target_properties(zlib PROPERTIES IMPORTED_LOCATION ${EXTERNAL_BASE_DIR}/lib
 add_dependencies(zlib zlib_src)
 
 set(ZLIB_SRC_DIR ${EXTERNAL_BASE_DIR}/src/zlib_src)
-set_source_files_properties(${ZLIB_SRC_DIR}/contrib/minizip/ioapi.c PROPERTIES GENERATED 1)
-set_source_files_properties(${ZLIB_SRC_DIR}/contrib/minizip/unzip.c PROPERTIES GENERATED 1)
-set_source_files_properties(${ZLIB_SRC_DIR}/contrib/minizip/iowin32.c PROPERTIES GENERATED 1)
 
 ExternalProject_Add(
     xml2_src
+    DEPENDS zlib
     PREFIX ${EXTERNAL_BASE_DIR}
     GIT_REPOSITORY https://github.com/GNOME/libxml2.git
     GIT_TAG 60d3056c97067e6cb2125284878ed7c99c90ed81 # v2.13.4

Diff for: fmusim-gui/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.18)
 
 project(fmusim-gui VERSION 0.1 LANGUAGES C CXX)
 
@@ -10,14 +10,16 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
-set(CVODE_DIR    ${CMAKE_SOURCE_DIR}/build/cvode-x86_64-windows/install)
-set(LIBXML2_DIR  ${CMAKE_SOURCE_DIR}/build/libxml2-x86_64-windows/install)
-set(ZLIB_DIR     ${CMAKE_SOURCE_DIR}/build/zlib-x86_64-windows/install)
-
-set(ZLIB_SRC_DIR ${CMAKE_SOURCE_DIR}/build/zlib-1.3.1)
-
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
-find_package(Qt6 REQUIRED COMPONENTS WebEngineWidgets)
+if(QT_VERSION_MAJOR GREATER_EQUAL 6)
+    find_package(Qt6 REQUIRED COMPONENTS WebEngineWidgets)
+endif()
+
+set_source_files_properties(
+    ${ZLIB_SRC_DIR}/contrib/minizip/ioapi.c
+    ${ZLIB_SRC_DIR}/contrib/minizip/unzip.c
+    ${ZLIB_SRC_DIR}/contrib/minizip/iowin32.c
+    PROPERTIES GENERATED 1)
 
 set(PROJECT_SOURCES
     main.cpp
@@ -31,14 +33,42 @@ set(PROJECT_SOURCES
     ../fmusim/miniunzip.c
     ${ZLIB_SRC_DIR}/contrib/minizip/unzip.c
     ${ZLIB_SRC_DIR}/contrib/minizip/ioapi.c
-    ${ZLIB_SRC_DIR}/contrib/minizip/iowin32.c
     ../fmusim/FMIModelDescription.c
     ../fmusim/FMIModelDescription.h
     ../fmusim/FMIBuildDescription.c
     ../fmusim/FMIBuildDescription.h
     ../src/structured_variable_name.tab.c
     ../src/structured_variable_name.yy.c
 )
+if (WIN32)
+    set (PROJECT_SOURCES ${PROJECT_SOURCES} ${ZLIB_SRC_DIR}/contrib/minizip/iowin32.c)
+endif ()
+
+if(WIN32)
+    set(PROJECT_LIBRARIES
+        ${EXTERNAL_BASE_DIR}/lib/libxml2s.lib
+        ${EXTERNAL_BASE_DIR}/lib/zlibstatic.lib
+        ${EXTERNAL_BASE_DIR}/lib/sundials_cvode_static.lib
+        ${EXTERNAL_BASE_DIR}/lib/sundials_core_static.lib
+        )
+elseif(UNIX AND NOT APPLE)
+    set(PROJECT_LIBRARIES
+        ${EXTERNAL_BASE_DIR}/lib/libxml2.a
+        ${EXTERNAL_BASE_DIR}/lib/libz.a
+        ${EXTERNAL_BASE_DIR}/lib/libsundials_cvode.a
+        ${EXTERNAL_BASE_DIR}/lib/libsundials_core.a
+        ${CMAKE_DL_LIBS}
+        m
+        )
+else()
+    set(PROJECT_LIBRARIES
+        ${EXTERNAL_BASE_DIR}/lib/libxml2.a
+        ${EXTERNAL_BASE_DIR}/lib/libz.a
+        ${EXTERNAL_BASE_DIR}/lib/libsundials_cvode.a
+        ${EXTERNAL_BASE_DIR}/lib/libsundials_core.a
+        )
+endif()
+
 
 if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
     qt_add_executable(fmusim-gui
@@ -109,26 +139,27 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
         resources/build/build.qrc
     )
 
-target_include_directories(fmusim-gui PRIVATE
-    ../include
-    ../fmusim
-    ${LIBXML2_DIR}/include/libxml2
-    ${ZLIB_DIR}/include
-    ${ZLIB_SRC_DIR}/contrib/minizip
-    ${CVODE_DIR}/include
-)
+    add_dependencies(fmusim-gui zlib xml2 cvcode)
 
-target_compile_definitions(fmusim-gui PRIVATE
-    YY_NO_UNISTD_H
-)
+    target_include_directories(fmusim-gui PRIVATE
+        ../include
+        ../fmusim
+        ${EXTERNAL_BASE_DIR}/include
+        ${EXTERNAL_BASE_DIR}/include/libxml2
+        ${ZLIB_SRC_DIR}/contrib/minizip
+        ${ZLIB_SRC_DIR}/contrib/minizip
+    )
 
-target_link_libraries(fmusim-gui PRIVATE
-    Qt6::WebEngineWidgets
-    ${LIBXML2_DIR}/lib/libxml2.lib
-    ${ZLIB_DIR}/lib/zlib.lib
-    ${CVODE_DIR}/lib/sundials_cvode_static.lib
-    ${CVODE_DIR}/lib/sundials_core_static.lib
-)
+    if(WIN32)
+        target_compile_definitions(fmusim-gui PRIVATE
+            YY_NO_UNISTD_H
+        )
+    endif()
+
+    target_link_libraries(fmusim-gui PRIVATE
+        Qt6::WebEngineWidgets
+        ${PROJECT_LIBRARIES}
+    )
 
 # Define target properties for Android with Qt 6 as:
 #    set_property(TARGET fmusim-gui APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
@@ -171,6 +202,6 @@ install(TARGETS fmusim-gui
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
 
-if(QT_VERSION_MAJOR EQUAL 6)
+if(QT_VERSION_MAJOR GREATER_EQUAL 6)
     qt_finalize_executable(fmusim-gui)
 endif()

Diff for: fmusim-gui/MainWindow.cpp

@@ -26,6 +26,8 @@ extern "C" {
 #include "FMICVode.h"
 }
 
+#include <cstring>
+
 #define FMI_PATH_MAX 4096
 
 
@@ -561,7 +563,7 @@ void MainWindow::simulate() {
 
     const QByteArray ba = unzipdir.toLocal8Bit();
 
-    settings->unzipdir = _strdup(ba.data());
+    settings->unzipdir = strdup(ba.data());
     settings->modelDescription = modelDescription;
 
     if (interfaceTypeComboBox->currentText() == "Co-Simulation") {
@@ -610,7 +612,7 @@ void MainWindow::simulate() {
     for (auto [variable, value] : startValues.asKeyValueRange()) {
         settings->startVariables[i] = (FMIModelVariable*)variable;
         QByteArray buffer = value.toLocal8Bit();
-        settings->startValues[i] = _strdup(buffer.data());
+        settings->startValues[i] = strdup(buffer.data());
         i++;
     }
 

Diff for: fmusim/CMakeLists.txt

@@ -12,8 +12,6 @@ endif ()
 
 set(FMUSIM_VERSION "" CACHE STRING "")
 
-include(../build/external.cmake)
-
 if (WIN32)
     set(FMUSIM_DIST_DIR ${CMAKE_BINARY_DIR}/dist/fmusim-windows/)
 elseif (APPLE)
@@ -26,6 +24,12 @@ project (FMUSim)
 
 file(MAKE_DIRECTORY ${FMUSIM_DIST_DIR})
 
+set_source_files_properties(
+    ${ZLIB_SRC_DIR}/contrib/minizip/ioapi.c
+    ${ZLIB_SRC_DIR}/contrib/minizip/unzip.c
+    ${ZLIB_SRC_DIR}/contrib/minizip/iowin32.c
+    PROPERTIES GENERATED 1)
+
 set(sources
   ../include/FMI.h
   ../src/FMI.c