Skip to content

Commit 6d7a397

Browse files
committed
Implement State Event Detection (#1341)
1 parent 5ebd86d commit 6d7a397

12 files changed

Lines changed: 686 additions & 134 deletions

File tree

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@ if(NOT OPENMODELICA_NEW_CMAKE_BUILD)
1919
include(OMSimulatorTopLevelSettings)
2020
endif()
2121

22+
## Define NOMINMAX globally
23+
add_definitions(-DNOMINMAX)
24+
2225
## If OMSimulator is being built as part of OpenModelica
2326
## set the install component to 'omsimulator' for all tagets built by it.
2427
if(OPENMODELICA_NEW_CMAKE_BUILD)
2528
set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME omsimulator)
2629
endif()
2730

28-
2931
include(GetGitRevisionDescription)
3032
if (EXISTS "${CMAKE_SOURCE_DIR}/version.txt")
3133
file(STRINGS "version.txt" OMS_VERSION_STRING)

Jenkinsfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -634,15 +634,14 @@ void buildOMS() {
634634
echo cd \${MSYS_WORKSPACE}
635635
echo export MAKETHREADS=-j%NUMBER_OF_PROCESSORS%
636636
echo set -ex
637-
echo git fetch --tags
638637
echo cmake -S . -B build/ -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install/ -DOM_OMS_ENABLE_TESTSUITE:BOOL=ON
639638
echo cmake --build build/ --parallel %NUMBER_OF_PROCESSORS% --target install -v
640639
) > buildOMSimulatorWindows.sh
641640
642641
set MSYSTEM=${env.MSYSTEM ? env.MSYSTEM : "UCRT64"}
643642
set MSYS2_PATH_TYPE=inherit
644-
cat buildOMSimulatorWindows.sh
645-
echo \$PATH
643+
type buildOMSimulatorWindows.sh
644+
echo %PATH%
646645
%OMDEV%\\tools\\msys\\usr\\bin\\sh --login -c "cd `cygpath '${WORKSPACE}'` && chmod +x buildOMSimulatorWindows.sh && ./buildOMSimulatorWindows.sh && rm -f ./buildOMSimulatorWindows.sh"
647646
""")
648647
} else {

0 commit comments

Comments
 (0)