Skip to content

Commit 7632ea0

Browse files
benstonezhangbenstonezhang
committed
support separate build of fmusim-gui
Signed-off-by: Benstone Zhang <[email protected]>
1 parent 1f95d8c commit 7632ea0

File tree

5 files changed

+53
-54
lines changed

5 files changed

+53
-54
lines changed

Diff for: ‎.github/workflows/build-fmusim-gui.yml

-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ jobs:
2424
arch: 'win64_msvc2019_64'
2525
modules: 'qtpositioning qtwebchannel qtwebengine'
2626
- run: python -m pip install fmpy requests
27-
- run: python fmusim-gui/build/build_cvode.py
28-
- run: python fmusim-gui/build/build_libxml2.py
29-
- run: python fmusim-gui/build/build_zlib.py
3027
- run: cmake -D CMAKE_PREFIX_PATH=${{env.QT_ROOT_DIR}} -S fmusim-gui -B fmusim-gui/build/fmusim-gui
3128
- run: cmake --build fmusim-gui/build/fmusim-gui --config Release
3229
- run: ${{env.QT_ROOT_DIR}}\bin\windeployqt.exe fmusim-gui\build\fmusim-gui\Release\fmusim-gui.exe

Diff for: ‎.github/workflows/build.yml

-3
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ jobs:
5050
run: |
5151
sudo apt-get update
5252
sudo apt-get install gcc-aarch64-linux-gnu qemu-user
53-
- run: python build/build_cvode.py ${{ matrix.name }}
54-
- run: python build/build_libxml2.py ${{ matrix.name }}
55-
- run: python build/build_zlib.py ${{ matrix.name }}
5653
- run: python build/build.py ${{ matrix.name }}
5754
- if: matrix.name != 'aarch64-darwin'
5855
run: pytest tests --platform ${{ matrix.name }}

Diff for: ‎build/external.cmake

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ ExternalProject_Add(
1414
GIT_TAG 51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf # v1.3.1
1515
GIT_SHALLOW True
1616
UPDATE_DISCONNECTED True
17-
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTERNAL_BASE_DIR} -DCMAKE_BUILD_TYPE=Release -DCMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY} -DZLIB_BUILD_MINIZIP=1
17+
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTERNAL_BASE_DIR} -DCMAKE_BUILD_TYPE=Release -DCMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY}
18+
# for zlib version v1.3.2+ add "-DZLIB_BUILD_MINIZIP=1"
1819
BUILD_COMMAND ${CMAKE_COMMAND} --build . --config Release
1920
BUILD_BYPRODUCTS ${EXTERNAL_BASE_DIR}/lib/libz.a
2021
INSTALL_COMMAND ${CMAKE_COMMAND} --install . --config Release

Diff for: ‎build/sim_common.cmake

+46-46
Original file line numberDiff line numberDiff line change
@@ -15,50 +15,50 @@ set_source_files_properties(
1515
PROPERTIES GENERATED 1)
1616

1717
set(FMUSIM_SOURCES
18-
${CMAKE_SOURCE_DIR}/include/FMI.h
19-
${CMAKE_SOURCE_DIR}/src/FMI.c
20-
${CMAKE_SOURCE_DIR}/include/FMI1.h
21-
${CMAKE_SOURCE_DIR}/src/FMI1.c
22-
${CMAKE_SOURCE_DIR}/include/FMI2.h
23-
${CMAKE_SOURCE_DIR}/src/FMI2.c
24-
${CMAKE_SOURCE_DIR}/include/FMI3.h
25-
${CMAKE_SOURCE_DIR}/src/FMI3.c
26-
${CMAKE_SOURCE_DIR}/fmusim/FMIUtil.h
27-
${CMAKE_SOURCE_DIR}/fmusim/FMIUtil.c
28-
${CMAKE_SOURCE_DIR}/fmusim/FMIStaticInput.h
29-
${CMAKE_SOURCE_DIR}/fmusim/FMIStaticInput.c
30-
${CMAKE_SOURCE_DIR}/fmusim/FMISimulation.h
31-
${CMAKE_SOURCE_DIR}/fmusim/FMISimulation.c
32-
${CMAKE_SOURCE_DIR}/fmusim/FMI1CSSimulation.h
33-
${CMAKE_SOURCE_DIR}/fmusim/FMI1CSSimulation.c
34-
${CMAKE_SOURCE_DIR}/fmusim/FMI1MESimulation.h
35-
${CMAKE_SOURCE_DIR}/fmusim/FMI1MESimulation.c
36-
${CMAKE_SOURCE_DIR}/fmusim/FMI2CSSimulation.h
37-
${CMAKE_SOURCE_DIR}/fmusim/FMI2CSSimulation.c
38-
${CMAKE_SOURCE_DIR}/fmusim/FMI2MESimulation.h
39-
${CMAKE_SOURCE_DIR}/fmusim/FMI2MESimulation.c
40-
${CMAKE_SOURCE_DIR}/fmusim/FMI3CSSimulation.h
41-
${CMAKE_SOURCE_DIR}/fmusim/FMI3CSSimulation.c
42-
${CMAKE_SOURCE_DIR}/fmusim/FMI3MESimulation.h
43-
${CMAKE_SOURCE_DIR}/fmusim/FMI3MESimulation.c
44-
${CMAKE_SOURCE_DIR}/fmusim/FMIRecorder.h
45-
${CMAKE_SOURCE_DIR}/fmusim/FMIRecorder.c
46-
${CMAKE_SOURCE_DIR}/fmusim/FMIEuler.h
47-
${CMAKE_SOURCE_DIR}/fmusim/FMIEuler.c
48-
${CMAKE_SOURCE_DIR}/fmusim/FMICVode.h
49-
${CMAKE_SOURCE_DIR}/fmusim/FMICVode.c
50-
${CMAKE_SOURCE_DIR}/fmusim/csv.h
51-
${CMAKE_SOURCE_DIR}/fmusim/csv.c
52-
${CMAKE_SOURCE_DIR}/fmusim/FMIZip.h
53-
${CMAKE_SOURCE_DIR}/fmusim/FMIZip.c
54-
${CMAKE_SOURCE_DIR}/fmusim/miniunzip.c
55-
${CMAKE_SOURCE_DIR}/fmusim/FMIModelDescription.c
56-
${CMAKE_SOURCE_DIR}/fmusim/FMIModelDescription.h
57-
${CMAKE_SOURCE_DIR}/fmusim/FMIBuildDescription.c
58-
${CMAKE_SOURCE_DIR}/fmusim/FMIBuildDescription.h
59-
${CMAKE_SOURCE_DIR}/include/structured_variable_name.tab.h
60-
${CMAKE_SOURCE_DIR}/src/structured_variable_name.tab.c
61-
${CMAKE_SOURCE_DIR}/src/structured_variable_name.yy.c
18+
../include/FMI.h
19+
../src/FMI.c
20+
../include/FMI1.h
21+
../src/FMI1.c
22+
../include/FMI2.h
23+
../src/FMI2.c
24+
../include/FMI3.h
25+
../src/FMI3.c
26+
../fmusim/FMIUtil.h
27+
../fmusim/FMIUtil.c
28+
../fmusim/FMIStaticInput.h
29+
../fmusim/FMIStaticInput.c
30+
../fmusim/FMISimulation.h
31+
../fmusim/FMISimulation.c
32+
../fmusim/FMI1CSSimulation.h
33+
../fmusim/FMI1CSSimulation.c
34+
../fmusim/FMI1MESimulation.h
35+
../fmusim/FMI1MESimulation.c
36+
../fmusim/FMI2CSSimulation.h
37+
../fmusim/FMI2CSSimulation.c
38+
../fmusim/FMI2MESimulation.h
39+
../fmusim/FMI2MESimulation.c
40+
../fmusim/FMI3CSSimulation.h
41+
../fmusim/FMI3CSSimulation.c
42+
../fmusim/FMI3MESimulation.h
43+
../fmusim/FMI3MESimulation.c
44+
../fmusim/FMIRecorder.h
45+
../fmusim/FMIRecorder.c
46+
../fmusim/FMIEuler.h
47+
../fmusim/FMIEuler.c
48+
../fmusim/FMICVode.h
49+
../fmusim/FMICVode.c
50+
../fmusim/csv.h
51+
../fmusim/csv.c
52+
../fmusim/FMIZip.h
53+
../fmusim/FMIZip.c
54+
../fmusim/miniunzip.c
55+
../fmusim/FMIModelDescription.c
56+
../fmusim/FMIModelDescription.h
57+
../fmusim/FMIBuildDescription.c
58+
../fmusim/FMIBuildDescription.h
59+
../include/structured_variable_name.tab.h
60+
../src/structured_variable_name.tab.c
61+
../src/structured_variable_name.yy.c
6262
${ZLIB_SRC_DIR}/contrib/minizip/unzip.c
6363
${ZLIB_SRC_DIR}/contrib/minizip/ioapi.c
6464
)
@@ -67,8 +67,8 @@ if(WIN32)
6767
endif()
6868

6969
set(FMUSIM_INCLUDES
70-
${CMAKE_SOURCE_DIR}/fmusim
71-
${CMAKE_SOURCE_DIR}/include
70+
../fmusim
71+
../include
7272
${EXTERNAL_BASE_DIR}/include
7373
${EXTERNAL_BASE_DIR}/include/libxml2
7474
${ZLIB_SRC_DIR}/contrib/minizip

Diff for: ‎fmusim-gui/CMakeLists.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ if(QT_VERSION_MAJOR GREATER_EQUAL 6)
1515
find_package(Qt6 REQUIRED COMPONENTS WebEngineWidgets)
1616
endif()
1717

18-
include(${CMAKE_SOURCE_DIR}/build/sim_common.cmake)
18+
get_directory_property(NestProject PARENT_DIRECTORY)
19+
if(NOT NestProject)
20+
include(../build/external.cmake)
21+
endif()
22+
include(../build/sim_common.cmake)
1923

2024
set(FMUSIM_GUI_SOURCES
2125
${FMUSIM_SOURCES}

0 commit comments

Comments
 (0)