Changeset f1024952 in OpenModelica

Timestamp:

2021-05-07T09:29:16+02:00 (3 years ago)

Author:

GitHub <noreply@…>

Branches:

maintenance/v1.17

Children:

03f0da6b, 359fa1d

Parents:

c5975376

git-author:

Martin Sjölund <martin@…> (05/07/21 09:29:16)

git-committer:

GitHub <noreply@…> (05/07/21 09:29:16)

Message:

Fix build with cmake >= 3.20 (#7445, #7447)

When running cmake to generate a project buildsystem, --build is an unknown
command line argument. Since cmake 3.20 this is rejected with an error,
and not silently ignored anymore.

Therefore, the cmake call was split into generation of the build system and
build process.

Co-authored-by: spinnau <spinnau@…>

File:

• OMCompiler/Makefile.omsi.common (modified) (1 diff)

OMCompiler/Makefile.omsi.common

@@ -7 +7 @@
 CMAKE_FLAGS=-DCMAKE_BUILD_TYPE=$(BUILDTYPE)
 
-CMAKE_CALL=cmake -G $(CMAKE_TARGET) --build . -DPLATFORM=$(PLATFORM) $(CMAKE_FLAGS) $(IS_MINGW32) $(IS_MINGW64) -DCMAKE_INSTALL_PREFIX:PATH="$(OMBUILDDIR)" -DLIB_OMC=$(LIB_OMC) ..
+CMAKE_CALL=cmake .. -G $(CMAKE_TARGET) -DPLATFORM=$(PLATFORM) $(CMAKE_FLAGS) $(IS_MINGW32) $(IS_MINGW64) -DCMAKE_INSTALL_PREFIX:PATH="$(OMBUILDDIR)" -DLIB_OMC=$(LIB_OMC) && cmake --build .
 
 .PHONY: OMSIBaseClean OMSICClean OMSIBaseMSVC OMSI OMSIBaseInstall OMSICInstall OMSI-clean OMSICClean OMSICPP OMSICPPinstall