try to fix fpic error in cpp template

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20338 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · May 1, 2014 · 8ce9539 · 8ce9539
1 parent 1cc8562
commit 8ce9539
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/Compiler/Template/CodegenCpp.tpl b/Compiler/Template/CodegenCpp.tpl
@@ -1308,9 +1308,9 @@ LINK=<%makefileParams.linker%>
 EXEEXT=<%makefileParams.exeext%>
 DLLEXT=<%makefileParams.dllext%>
 CFLAGS_BASED_ON_INIT_FILE=<%extraCflags%>
-CFLAGS=$(CFLAGS_BASED_ON_INIT_FILE) -I"<%makefileParams.omhome%>/include/omc/cpp/Core" -I"<%makefileParams.omhome%>/include/omc/cpp/"   -I. <%makefileParams.includes%> -I"$(BOOST_INCLUDE)" <%makefileParams.includes ; separator=" "%> <%makefileParams.cflags%> <%match sopt case SOME(s as SIMULATION_SETTINGS(__)) then s.cflags %>
+CFLAGS=$(CFLAGS_BASED_ON_INIT_FILE) -Winvalid-pch  -I"<%makefileParams.omhome%>/include/omc/cpp/Core" -I"<%makefileParams.omhome%>/include/omc/cpp/"   -I. <%makefileParams.includes%> -I"$(BOOST_INCLUDE)" <%makefileParams.includes ; separator=" "%> $(FPIC) <%match sopt case SOME(s as SIMULATION_SETTINGS(__)) then s.cflags %>
 LDSYTEMFLAGS=-L"<%makefileParams.omhome%>/lib/omc/cpp"    -L"$(BOOST_LIBS)"
-LDMAINFLAGS=-L"<%makefileParams.omhome%>/lib/omc/cpp" <%simulationMainDLLib(simCode)%> -L"<%makefileParams.omhome%>/bin" -lOMCppOMCFactory -L"$(BOOST_LIBS)" $(BOOST_SYSTEM_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB)
+LDMAINFLAGS=-L"<%makefileParams.omhome%>/lib/omc/cpp"   -L"<%makefileParams.omhome%>/bin" -lOMCppOMCFactory -L"$(BOOST_LIBS)" $(BOOST_SYSTEM_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(LINUX_LIB_DL)
 CPPFLAGS = $(CFLAGS) -DOMC_BUILD -DBOOST_SYSTEM_NO_DEPRICATED
 SYSTEMFILE=OMCpp<%fileNamePrefix%><% if acceptMetaModelicaGrammar() then ".conv"%>.cpp
 FUNCTIONFILE=OMCpp<%fileNamePrefix%>Functions.cpp

diff --git a/SimulationRuntime/cpp/CMakeLists.txt b/SimulationRuntime/cpp/CMakeLists.txt
@@ -321,7 +321,7 @@ ENDFOREACH(HEADER)
 ENDMACRO(INSTALL_HEADERS_WITH_DIRECTORY)
 
 
-#add_precompiled_header(${ModelicaName} Include/Core/Modelica.h )
+add_precompiled_header(${ModelicaName} Include/Core/Modelica.h )
 
 install (FILES "${PROJECT_BINARY_DIR}/LibrariesConfig.h" DESTINATION include/omc/cpp)
 

diff --git a/SimulationRuntime/cpp/Core/Modelica/CMakeLists.txt b/SimulationRuntime/cpp/Core/Modelica/CMakeLists.txt
@@ -19,6 +19,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   include(CheckTypeSize)
   check_type_size("void*" SIZEOF_VOID_P BUILTIN_TYPES_ONLY)
   set(LINUX_LIB_DL "-ldl")
+  set(FPIC "-fPIC")
   if(${SIZEOF_VOID_P} MATCHES 8)
     set(FMI_ARCH_DIR "linux64")
   else(${SIZEOF_VOID_P} MATCHES 8)

diff --git a/SimulationRuntime/cpp/Core/Modelica/ModelicaConfig.inc.in b/SimulationRuntime/cpp/Core/Modelica/ModelicaConfig.inc.in
@@ -15,3 +15,4 @@ LAPACK_LIBS = @LAPACK_LIBRARIES_@
 MODELICA_SYSTEM_LIB_EXT = @MODELICA_SYSTEM_LIB_EXT@
 FMI_ARCH_DIR = @FMI_ARCH_DIR@
 LINUX_LIB_DL = @LINUX_LIB_DL@
+FPIC = @FPIC@
diff --git a/SimulationRuntime/cpp/PrecompiledHeader.cmake b/SimulationRuntime/cpp/PrecompiledHeader.cmake
@@ -79,6 +79,9 @@ STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _flags_var_name)
 SET(_compiler_FLAGS ${${_flags_var_name}})
 #remove compiler flag for optimization becaus Modelica system is compiled without optimization
 string(REGEX REPLACE "O[1-9]" "O0" _compiler_FLAGS ${_compiler_FLAGS} )
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+set(_compiler_FLAGS "${_compiler_FLAGS} -fPIC")
+endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 GET_DIRECTORY_PROPERTY(_directory_flags INCLUDE_DIRECTORIES)
 FOREACH(item ${_directory_flags})
 LIST(APPEND _compiler_FLAGS "-I${item}")