- fixed measure time linker error (GCC)

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@22098 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Sep 2, 2014 · 3e89aea · 3e89aea
1 parent 492f289
commit 3e89aea
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/Compiler/Template/CodegenCpp.tpl b/Compiler/Template/CodegenCpp.tpl
@@ -1578,10 +1578,12 @@ let libsPos1 = if not dirExtra then libsStr //else ""
 let libsPos2 = if dirExtra then libsStr // else ""
 let _extraCflags = match sopt case SOME(s as SIMULATION_SETTINGS(__)) then ""
 let extraCflags = '<%_extraCflags%><% if Flags.isSet(Flags.GEN_DEBUG_SYMBOLS) then " -g"%>'
-let &timeMeasureLink += if boolNot(stringEq(getConfigString(PROFILING_LEVEL),"none")) then " -lOMCppExtensionUtilities"
+let &timeMeasureLink += if boolNot(stringEq(getConfigString(PROFILING_LEVEL),"none")) then ' -Wl,-rpath,"<%makefileParams.omhome%>/lib/omc/cpp" -lOMCppExtensionUtilities'
 <<
 # Makefile generated by OpenModelica
 include <%makefileParams.omhome%>/include/omc/cpp/ModelicaConfig.inc
+OMHOME=<%makefileParams.omhome%>
+include <%makefileParams.omhome%>/include/omc/cpp/ModelicaLibraryConfig.inc
 # Simulations use -O0 by default
 SIM_OR_DYNLOAD_OPT_LEVEL=-O0
 CC=<%makefileParams.ccompiler%>
@@ -1592,7 +1594,7 @@ DLLEXT=<%makefileParams.dllext%>
 CFLAGS_BASED_ON_INIT_FILE=<%extraCflags%>
 CFLAGS=$(CFLAGS_BASED_ON_INIT_FILE) -Winvalid-pch $(SYSTEM_CFLAGS) -I"<%makefileParams.omhome%>/include/omc/cpp/Core" -I"<%makefileParams.omhome%>/include/omc/cpp/"   -I. <%makefileParams.includes%> -I"$(BOOST_INCLUDE)" -I"$(SUITESPARSE_INCLUDE)" <%makefileParams.includes ; separator=" "%>  <%match sopt case SOME(s as SIMULATION_SETTINGS(__)) then s.cflags %>
 LDSYTEMFLAGS=-L"<%makefileParams.omhome%>/lib/omc/cpp" $(BASE_LIB)  -lOMCppOMCFactory -lOMCppSystem -lOMCppModelicaUtilities -lOMCppMath <%timeMeasureLink%> -L"$(BOOST_LIBS)"  $(BOOST_SYSTEM_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_LOG_LIB) $(BOOST_THREAD_LIB) $(LINUX_LIB_DL)
-LDMAINFLAGS=-L"<%makefileParams.omhome%>/lib/omc/cpp"   -L"<%makefileParams.omhome%>/bin"  -lOMCppOMCFactory <%timeMeasureLink%> -L"$(BOOST_LIBS)" $(BOOST_SYSTEM_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(LINUX_LIB_DL)
+LDMAINFLAGS=-L"<%makefileParams.omhome%>/lib/omc/cpp"   -L"<%makefileParams.omhome%>/bin"  -lOMCppOMCFactory <%timeMeasureLink%> -L"$(BOOST_LIBS)" $(BOOST_SYSTEM_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) -Wl,-rpath,$(LIBOMCPPEXTENSIONUTILITIES) $(LINUX_LIB_DL)
 CPPFLAGS = $(CFLAGS)
 SYSTEMFILE=OMCpp<%fileNamePrefix%><% if acceptMetaModelicaGrammar() then ".conv"%>.cpp
 MAINFILE = OMCpp<%fileNamePrefix%>Main.cpp

diff --git a/SimulationRuntime/cpp/Core/Utils/extension/CMakeLists.txt b/SimulationRuntime/cpp/Core/Utils/extension/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 2.6)
 
 project(${ExtensionUtilitiesName})
 
-add_library(${ExtensionUtilitiesName} SHARED measure_time.cpp)
+add_library(${ExtensionUtilitiesName} STATIC measure_time.cpp)
 target_link_libraries (${ExtensionUtilitiesName} ${Boost_LIBRARIES})
 
 if (UNIX)

diff --git a/SimulationRuntime/cpp/Core/Utils/extension/measure_time.cpp b/SimulationRuntime/cpp/Core/Utils/extension/measure_time.cpp
@@ -1,4 +1,4 @@
-#include "Core/Utils/extension/measure_time.hpp"
+#include <Core/Utils/extension/measure_time.hpp>
 
 RDTSC_MeasureTime * MeasureTime::instance = 0;
 

diff --git a/SimulationRuntime/cpp/Include/Core/Utils/extension/measure_time.hpp b/SimulationRuntime/cpp/Include/Core/Utils/extension/measure_time.hpp
@@ -11,11 +11,12 @@
 #include <vector>
 #include <ctime>
 #include <iostream>
+#include <Core/Modelica.h>
 
 
 class RDTSC_MeasureTime;
 
-class MeasureTime
+class BOOST_EXTENSION_EXPORT_DECL MeasureTime
 {
 public:
   MeasureTime() {}
@@ -42,7 +43,7 @@ class MeasureTime
 	static RDTSC_MeasureTime *instance;
 };
 
-class RDTSC_MeasureTime : public MeasureTime
+class BOOST_EXTENSION_EXPORT_DECL RDTSC_MeasureTime : public MeasureTime
 {
 public:
 	RDTSC_MeasureTime() : MeasureTime() {};