Skip to content

Commit

Permalink
Fix build with cmake >= 3.20 (#7445, #7447)
Browse files Browse the repository at this point in the history 
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@gmail.com>
  • Loading branch information
@sjoelund @spinnau
sjoelund and spinnau committed May 7, 2021
1 parent c597537 commit f102495
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion OMCompiler/Makefile.omsi.common
View file
Expand Up @@ -6,7 +6,7 @@ PLATFORMS=static dynamic

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

Expand Down

0 comments on commit f102495

Please sign in to comment.