Skip to content

Commit 177f01b

Browse files
committed
- Changed FMIL to build in separate directory again
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12559 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent 5557985 commit 177f01b

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

Makefile.common

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,11 @@ runtimeCPPclean:
8686
(cd SimulationRuntime/cpp/; $(MAKE) -f $(defaultMakefileTarget) clean)
8787

8888
fmil:
89-
(cd 3rdParty/FMIL && test -f Makefile || $(CMAKE) -D FMILIB_BUILD_SHARED_LIB:Bool=OFF -D FMILIB_BUILD_TESTS:Bool=OFF -D FMILIB_GENERATE_DOXYGEN_DOC:Bool=OFF -DCMAKE_COLOR_MAKEFILE:Bool=OFF -DFMILIB_INSTALL_PREFIX:String=install . -G $(CMAKE_TARGET))
90-
test -f 3rdParty/FMIL/libfmilib.a || $(MAKE) -C 3rdParty/FMIL
91-
test -d 3rdParty/FMIL/install || $(MAKE) -C 3rdParty/FMIL install
89+
test -d 3rdParty/FMIL
90+
mkdir -p 3rdParty/FMIL/build
91+
(cd 3rdParty/FMIL/build && test -f Makefile || $(CMAKE) -D FMILIB_BUILD_SHARED_LIB:Bool=OFF -D FMILIB_BUILD_TESTS:Bool=OFF -D FMILIB_GENERATE_DOXYGEN_DOC:Bool=OFF -DCMAKE_COLOR_MAKEFILE:Bool=OFF -DFMILIB_INSTALL_PREFIX:String=../install .. -G $(CMAKE_TARGET))
92+
test -f 3rdParty/FMIL/build/libfmilib.a || $(MAKE) -C 3rdParty/FMIL/build
93+
test -d 3rdParty/FMIL/install || $(MAKE) -C 3rdParty/FMIL/build install
9294

9395
testfast: test
9496

0 commit comments

Comments
 (0)