fix for getStartValue in cpp template

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20901 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: niklwors

Compiler/Template/CodegenCpp.tpl

@@ -1309,7 +1309,7 @@ EXEEXT=<%makefileParams.exeext%>
 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)" <%makefileParams.includes ; separator=" "%>  <%match sopt case SOME(s as SIMULATION_SETTINGS(__)) then s.cflags %>
-LDSYTEMFLAGS=-L"<%makefileParams.omhome%>/lib/omc/cpp" -lOMCppBase  -lOMCppOMCFactory -lOMCppSystem -lOMCppModelicaUtilities -lOMCppMath  -L"$(BOOST_LIBS)"  $(BOOST_SYSTEM_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(LINUX_LIB_DL)
+LDSYTEMFLAGS=-L"<%makefileParams.omhome%>/lib/omc/cpp" $(BASE_LIB)  -lOMCppOMCFactory -lOMCppSystem -lOMCppModelicaUtilities -lOMCppMath  -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 -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
@@ -7893,6 +7893,10 @@ template crefStartValueType2(DAE.Type ty)
     case T_INTEGER(__) then 'Int'
     case T_REAL(__) then 'Real'
     case T_BOOL(__) then 'Bool'
+    case T_ENUMERATION(__) then 'Int'
+    case T_ARRAY(ty=T_INTEGER(__)) then 'Int'
+    case T_ARRAY(ty=T_REAL(__)) then 'Real'
+    case T_ARRAY(ty=T_BOOL(__)) then 'Bool'
   else "error start value type"
 end match
 

SimulationRuntime/cpp/CMakeLists.txt

@@ -199,6 +199,7 @@ add_subdirectory (Core/Math)
 add_subdirectory (Core/Utils/Modelica)
 add_subdirectory (Core/DataExchange)
 add_subdirectory (SimCoreFactory/OMCFactory)
+
 #add system default implemention project
 add_subdirectory (Core/System)
 #add solver default implemention project

SimulationRuntime/cpp/Core/Modelica/ModelicaConfig.inc.in

@@ -15,6 +15,7 @@ LAPACK_LIBS = @LAPACK_LIBRARIES_@
 MODELICA_SYSTEM_LIB_EXT = @MODELICA_SYSTEM_LIB_EXT@
 FMI_ARCH_DIR = @FMI_ARCH_DIR@
 LINUX_LIB_DL = @LINUX_LIB_DL@
+BASE_LIB = @BASE_LIB@
 PCH_FILE = @PCH_FILE@
 H_FILE = @H_FILE@
 BUILD_TYPE = @BUILD_TYPE@

SimulationRuntime/cpp/Core/System/CMakeLists.txt

@@ -1,8 +1,15 @@
 cmake_minimum_required (VERSION 2.6)
 
 project(${SystemName})
-add_library(${BasiLibName} STATIC tpl.cpp )
-set_target_properties(${BasiLibName} PROPERTIES COMPILE_FLAGS -fPIC)
+set(BASE_LIB "" CACHE INTERNAL "" )
+
+#IF (NOT ((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") OR  MSVC))
+#add_library(${BasiLibName} STATIC tpl.cpp )
+#set_target_properties(${BasiLibName} PROPERTIES COMPILE_FLAGS -fPIC)
+#set(BASE_LIB -l${BasiLibName} CACHE INTERNAL "" )
+#ENDIF (NOT ((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") OR  MSVC))
+
+
 # add the system default implementation library
 IF(ANALYZATION_MODE)
 	add_library(${SystemName} STATIC AlgLoopDefaultImplementation.cpp AlgLoopSolverFactory.cpp EventHandling.cpp SystemDefaultImplementation.cpp FactoryExport.cpp  )
@@ -23,8 +30,9 @@ endif(UNIX)
 
 install (TARGETS ${SystemName} DESTINATION lib/omc/${LIBINSTALLEXT})
 install (TARGETS ${SystemName}_static DESTINATION lib/omc/${LIBINSTALLEXT})
-install (TARGETS ${BasiLibName} DESTINATION lib/omc/${LIBINSTALLEXT})
-
+#IF (NOT ((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") OR  MSVC))
+#install (TARGETS ${BasiLibName} DESTINATION lib/omc/${LIBINSTALLEXT})
+#ENDIF (NOT ((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") OR  MSVC))
 install (FILES
 	${CMAKE_SOURCE_DIR}/Include/Core/System/SystemDefaultImplementation.h
 	${CMAKE_SOURCE_DIR}/Include/Core/System/AlgLoopDefaultImplementation.h

SimulationRuntime/cpp/Include/Core/ModelicaDefine.h

@@ -27,7 +27,7 @@ typedef double logRetType;
 typedef double coshRetType;
 
 
-
+/*
 #if !defined(_MSC_VER) && !defined( __APPLE__)
 //extern template class  boost::shared_ptr<IAlgLoopSolver>;
 //extern template class  boost::shared_ptr<IAlgLoop>;
@@ -55,4 +55,5 @@ extern template class  boost::function<void (unordered_map<string,unsigned int>&
 //extern template class  ublas::vector<double, adaptor_t>;
 //extern template class  ublas::matrix<double, adaptor_t> shared_matrix_t;
 
-#endif
+#endif
+*/