File tree Expand file tree Collapse file tree 2 files changed +14
-1
lines changed
Expand file tree Collapse file tree 2 files changed +14
-1
lines changed Original file line number Diff line number Diff line change @@ -14,6 +14,7 @@ datadir = @datadir@
1414datarootdir = @datarootdir@
1515docdir = @docdir@
1616CMAKE = CC=$(CC ) CXX=$(CXX ) cmake
17+ CMAKE_GCC = GCC_CC=$(CC ) GCC_CXX=$(CXX ) cmake
1718CMAKE_TARGET = "Unix Makefiles"
1819OPENCL = @OPENCL@
1920AR = @AR@
@@ -27,6 +28,8 @@ APP=@APP@
2728
2829CC =@CC@
2930CXX =@CXX@
31+ GCC_CC =@CC@
32+ GCC_CXX =@CXX@
3033CFLAGS =@CFLAGS@
3134MSGPACK_CFLAGS =
3235CPPFLAGS =@CPPFLAGS@
@@ -126,7 +129,7 @@ ifeq (@MODELICA3D@,)
126129 @echo Skipping Modelica3D
127130else
128131 cd 3rdParty/modelica3d && mkdir -p build
129- cd 3rdParty/modelica3d/build && $(CMAKE ) -DCMAKE_COLOR_MAKEFILE:Bool=OFF -DOSG_BACKEND=1 -DUSE_OMC=0 ..
132+ cd 3rdParty/modelica3d/build && $(CMAKE_GCC ) -DCMAKE_COLOR_MAKEFILE:Bool=OFF -DOSG_BACKEND=1 -DUSE_OMC=0 ..
130133 $(MAKE) -C 3rdParty/modelica3d/build
131134 cp -p 3rdParty/modelica3d/build/backends/osg-gtk/libm3d-osg-gtk.so 3rdParty/modelica3d/build/lib/proc3d/libproc3d.so build/lib/
132135 cp -p 3rdParty/modelica3d/lib/modcount/src/c/modcount.h 3rdParty/modelica3d/lib/modbus/src/c/modbus.h build/include/omc/
Original file line number Diff line number Diff line change @@ -84,6 +84,8 @@ AC_SUBST(APP)
8484AC_SUBST(OMC)
8585AC_SUBST(OMCTARGET)
8686AC_SUBST(BOOTSTRAP_STATIC)
87+ AC_SUBST(GCC_CC)
88+ AC_SUBST(GCC_CXX)
8789
8890FINAL_MESSAGES="\nConfigured OpenModelica successfully using the following options:"
8991
@@ -791,6 +793,14 @@ if test -n "$QMAKE"; then
791793 fi
792794fi
793795
796+ if test -f /usr/bin/gcc -a -f /usr/bin/g++; then
797+ GCC_CC=gcc
798+ GCC_CXX=g++
799+ else
800+ GCC_CC=$CC
801+ GCC_CXX=$CXX
802+ fi
803+
794804if test "Darwin" = `uname`; then
795805 APP=".app"
796806 EXE=".app"
You can’t perform that action at this time.
0 commit comments