Fix compilation of cppruntime

OpenModelica · May 4, 2015 · 4114344 · 4114344
1 parent fc27f01
commit 4114344
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/Makefile.common b/Makefile.common
@@ -162,7 +162,7 @@ omc-and-runtimeCPPinstall: mkbuilddirs
 	$(MAKE) omc runtimeCPPinstall
 
 runtimeCPP: CMinpack
-	$(MAKE) -C SimulationRuntime/cpp/ -f $(defaultMakefileTarget) CC="$(CC)" CXX="$(CXX)"
+	$(MAKE) -C SimulationRuntime/cpp/ -f $(defaultMakefileTarget)
 
 CMAKE_ARGS=$(filter CMAKE_%, $(MAKEFLAGS))
 

diff --git a/SimulationRuntime/cpp/CMakeLists.txt b/SimulationRuntime/cpp/CMakeLists.txt
@@ -42,7 +42,7 @@ OPTION(SUNDIALS_ROOT "SUNDIALS ROOT" "")
 
 
 #Set Variables
-SET(MODELICAEXTERNALCDIR  "${CMAKE_SOURCE_DIR}/../../libraries/Resources/C-Sources")
+SET(MODELICAEXTERNALCDIR  "${CMAKE_SOURCE_DIR}/../../3rdParty/ModelicaExternalC/C-Sources")
 SET(USERTABDIR  "${CMAKE_SOURCE_DIR}/../../libraries/Resources/Data/Tables")
 
 SET(LIBINSTALLEXT "lib/omc/cpp" CACHE STRING "library directory")
@@ -187,12 +187,12 @@ ENDIF(WIN32)
 IF(MSVC)
     SET(CMinpack_Path "${CMAKE_SOURCE_DIR}/../../3rdParty/CMinpack/install_msvc")
 ELSE(MSVC)
-    SET(CMinpack_Path "${CMAKE_SOURCE_DIR}/../../3rdParty/CMinpack/install")
+    SET(CMinpack_Path "${CMAKE_SOURCE_DIR}/../../3rdParty/CMinpack/build")
 ENDIF(MSVC)
 
 FIND_PATH(CMINPACK_INCLUDE_DIR cminpack.h
           HINTS ${CMinpack_Path}
-          PATH_SUFFIXES include include/cminpack include/cminpack-1)
+          PATH_SUFFIXES include include/cminpack include/cminpack-1 ..)
 
 FIND_LIBRARY(CMINPACK_LIBRARY
              NAMES cminpack

diff --git a/SimulationRuntime/cpp/Core/ModelicaExternalC/CMakeLists.txt b/SimulationRuntime/cpp/Core/ModelicaExternalC/CMakeLists.txt
@@ -2,9 +2,9 @@ cmake_minimum_required (VERSION 2.8.6)
 
 project(${ModelicaExternalName})
 include_directories (${MODELICAEXTERNALCDIR})
-include_directories (${USERTABDIR})
-add_library(${ModelicaExternalName}    ${MODELICAEXTERNALCDIR}/ModelicaStandardTables.c  ${MODELICAEXTERNALCDIR}/ModelicaMatIO.c ${MODELICAEXTERNALCDIR}/ModelicaInternal.c ${MODELICAEXTERNALCDIR}/ModelicaStrings.c ${USERTABDIR}/usertab.c)
-add_library(${ModelicaTablesName}    ${MODELICAEXTERNALCDIR}/ModelicaStandardTables.c  ${MODELICAEXTERNALCDIR}/ModelicaMatIO.c ${USERTABDIR}/usertab.c)
+# include_directories (${USERTABDIR})
+add_library(${ModelicaExternalName}    ${MODELICAEXTERNALCDIR}/ModelicaStandardTables.c  ${MODELICAEXTERNALCDIR}/ModelicaMatIO.c ${MODELICAEXTERNALCDIR}/ModelicaInternal.c ${MODELICAEXTERNALCDIR}/ModelicaStrings.c) #  ${USERTABDIR}/usertab.c
+add_library(${ModelicaTablesName}    ${MODELICAEXTERNALCDIR}/ModelicaStandardTables.c  ${MODELICAEXTERNALCDIR}/ModelicaMatIO.c) #  ${USERTABDIR}/usertab.c
 if (UNIX)
 set_target_properties(${ModelicaExternalName} PROPERTIES COMPILE_FLAGS -fPIC)
 set_target_properties(${ModelicaTablesName} PROPERTIES COMPILE_FLAGS -fPIC)

diff --git a/SimulationRuntime/cpp/Makefile.in b/SimulationRuntime/cpp/Makefile.in
@@ -8,6 +8,9 @@ builddir_bin=$(top_builddir)/build/bin
 builddir_lib=$(top_builddir)/build/lib/omc
 builddir_inc=$(top_builddir)/build/include/omc
 
+CC=@CC@
+CXX=@CXX@
+
 RUNTIME_STATIC_LINKING_COMMAND="-DRUNTIME_STATIC_LINKING=ON"
 BOOST_STATIC_LINKING_COMMAND="-DBOOST_STATIC_LINKING=ON"
 BOOST_REALPATHS_COMMAND="-DUSE_BOOST_REALPATHS=ON"