Skip to content

Commit

Permalink
- fix FMI tests
Browse files Browse the repository at this point in the history
- force static build of fmilib on Windows and 
        shared build of fmilib on Linux/Other


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@17138 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adrpo committed Sep 8, 2013
1 parent 1b92d89 commit 1937f1a
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Makefile.common
Expand Up @@ -21,6 +21,8 @@ INSTALL_SHAREDIR = ${DESTDIR}${datadir}/
INSTALL_MANDIR = ${DESTDIR}${datadir}/man/
INSTALL_JAVADIR = ${DESTDIR}${datadir}/omc/java
INSTALL_LOCALEDIR = ${DESTDIR}${datadir}/locale
# For Linux/Other build dynamic FMI lib!
FMILIB_SHARED = ON

.PHONY : interactive omc release qtclient mosh all mkbuilddirs fmi test install-dirs susan susan_all susgen sustst install-python install-openturns runtimeCPPinstall boehm-gc

Expand Down Expand Up @@ -127,7 +129,7 @@ runtimeCPPclean:
fmil:
test -d 3rdParty/FMIL
mkdir -p 3rdParty/FMIL/build
(cd 3rdParty/FMIL/build && test -f Makefile || CFLAGS="$(CFLAGS) -g" CPPFLAGS="$(CPPFLAGS)" $(CMAKE) -D FMILIB_BUILD_SHARED_LIB:Bool=ON -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))
(cd 3rdParty/FMIL/build && test -f Makefile || CFLAGS="$(CFLAGS) -g" CPPFLAGS="$(CPPFLAGS)" $(CMAKE) -D FMILIB_BUILD_SHARED_LIB:Bool=$(FMILIB_SHARED) -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))
test -f 3rdParty/FMIL/build/$(LIBFMILIB) || $(MAKE) -C 3rdParty/FMIL/build
test -d 3rdParty/FMIL/install || $(MAKE) -C 3rdParty/FMIL/build install
test ! -f 3rdParty/FMIL/build/libfmilib_shared.so || cp -up 3rdParty/FMIL/build/libfmilib_shared.so 3rdParty/FMIL/build/libfmilib.so
Expand Down

0 comments on commit 1937f1a

Please sign in to comment.