fix for ModelicaExternalC usertab linker error in cpp runtime

OpenModelica · May 22, 2015 · 5c9479a · 5c9479a
1 parent eb6f814
commit 5c9479a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/SimulationRuntime/cpp/CMakeLists.txt b/SimulationRuntime/cpp/CMakeLists.txt
@@ -43,7 +43,7 @@ OPTION(BUILD_DOCUMENTATION "Use Doxygen to create the cpp runtime documentation"
 
 #Set Variables
 SET(MODELICAEXTERNALCDIR  "${CMAKE_SOURCE_DIR}/../../3rdParty/ModelicaExternalC/C-Sources")
-SET(USERTABDIR  "${CMAKE_SOURCE_DIR}/../../libraries/Resources/Data/Tables")
+SET(USERTABDIR  "${CMAKE_SOURCE_DIR}/../../../libraries/git/MSL/Modelica/Resources/Data/Tables")
 
 SET(LIBINSTALLEXT "lib/omc/cpp" CACHE STRING "library directory")
 SET(MODELICA_MODEL "ModelicaSystem")

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)