Skip to content

Commit

Permalink
- Use configured compilers for cmake crap
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12863 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Sep 11, 2012
1 parent 3269275 commit 122e29f
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,18 @@ libdir = @libdir@
includedir = @includedir@
datadir = @datadir@
docdir = @docdir@
CMAKE = cmake
CMAKE = CC=$(CC) CXX=$(CXX) cmake
CMAKE_TARGET = "Unix Makefiles"

defaultMakefileTarget = Makefile
QMAKE=@QMAKE@
EXE=@EXE@

CC=@CC@
CXX=@CXX@
CFLAGS=@CFLAGS@
CPPFLAGS=@CPPFLAGS@
CXXFLAGS=@CXXFLAGS@

include Makefile.common

Expand Down Expand Up @@ -79,7 +83,7 @@ ifeq (@MODELICA3D@,)
@echo Skipping Modelica3D
else
cd 3rdParty/modelica3d && mkdir -p build
cd 3rdParty/modelica3d/build && cmake -DCMAKE_COLOR_MAKEFILE:Bool=OFF -DOSG_BACKEND=1 ..
cd 3rdParty/modelica3d/build && $(CMAKE) -DCMAKE_COLOR_MAKEFILE:Bool=OFF -DOSG_BACKEND=1 ..
$(MAKE) -C 3rdParty/modelica3d/build
cp -p 3rdParty/modelica3d/build/backends/osg-gtk/libm3d-osg-gtk.so 3rdParty/modelica3d/build/lib/proc3d/libproc3d.so build/lib/
cp -p 3rdParty/modelica3d/lib/modcount/src/c/modcount.h 3rdParty/modelica3d/lib/modbus/src/c/modbus.h build/include/omc/
Expand Down

0 comments on commit 122e29f

Please sign in to comment.