- some more cleanups for path-stuff in cpp-runtime

- added some debug output to see the content of the ModelicaConfig.inc file at the beginning of cmake-build
- update for reference-file of NPendulummath-test (umfpack cpp runtime)

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

Compiler/Template/CodegenCppHpcom.tpl

@@ -1583,7 +1583,7 @@ template simulationMakefile(String target, SimCode simCode, Text& extraFuncs, Te
   let &additionalCFlags_MSVC += if stringEq(type,"openmp") then "/openmp" else ""
 
   let &additionalLinkerFlags_GCC = buffer ""
-  let &additionalLinkerFlags_GCC += if stringEq(type,"tbb") then " $(INTEL_TBB_LIBS) " else ""
+  let &additionalLinkerFlags_GCC += if stringEq(type,"tbb") then " $(INTEL_TBB_LIBRARIES) " else ""
 
   let &additionalLinkerFlags_MSVC = buffer ""
 

SimulationRuntime/cpp/Core/Modelica/CMakeLists.txt

@@ -148,6 +148,18 @@ ENDIF(WIN32)
 
 SET(UMFPACK_LIBS_ "${SUITESPARSE_UMFPACK_LIBS}")
 
+IF("${TBB_INCLUDE_DIR}" STREQUAL "")
+	SET(TBB_INCLUDE_DIR_ ".")
+ELSE()
+	SET(TBB_INCLUDE_DIR_ ${TBB_INCLUDE_DIR})
+ENDIF()
+
+IF("${PUGIXML_INCLUDE_DIR}" STREQUAL "")
+	SET(PUGIXML_INCLUDE_DIR_ ".")
+ELSE()
+	SET(PUGIXML_INCLUDE_DIR_ ${PUGIXML_INCLUDE_DIR})
+ENDIF()
+
 SET(Boost_LIBRARIES_NEW)
 FOREACH(lib ${Boost_LIBRARIES})
   GET_FILENAME_COMPONENT(libNew "${lib}" NAME_WE)
@@ -183,6 +195,21 @@ FOREACH(lib ${SUITESPARSE_UMFPACK_LIBRARIES_OMC})
 ENDFOREACH(lib ${SUITESPARSE_UMFPACK_LIBRARIES_OMC})
 #end Fix
 
+MESSAGE(STATUS " ")
+MESSAGE(STATUS "Values for *.inc files:")
+MESSAGE(STATUS "--BOOST_LIBS = ${Boost_LIBS_}")
+MESSAGE(STATUS "--BOOST_INCLUDE = ${Boost_INCLUDE_}")
+MESSAGE(STATUS "--BOOST_LIBRARIES = ${Boost_LIBRARIES_}")
+MESSAGE(STATUS "--SUNDIALS_LIBS = ${SUNDIALS_LIBS_}")
+MESSAGE(STATUS "--SUNDIALS_INCLUDE = ${SUNDIALS_INCLUDE_DIR_}")
+MESSAGE(STATUS "--SUNDIALS_LIBRARIES = ${SUNDIALS_LIBRARIES_}")
+MESSAGE(STATUS "--LAPACK_LIBS = ${LAPACK_LIBS_}")
+MESSAGE(STATUS "--LAPACK_LIBRARIES = ${LAPACK_LIBRARIES_}")
+MESSAGE(STATUS "--UMFPACK_LIBS = ${SUITESPARSE_UMFPACK_LIBS}")
+MESSAGE(STATUS "--UMFPACK_INCLUDE = ${SUITESPARSE_UMFPACK_INCLUDE_DIR_OMC}")
+MESSAGE(STATUS "--UMFPACK_LIBS = ${UMFPACK_LIBRARIES_}")
+MESSAGE(STATUS " ")
+
 add_precompiled_header(${ModelicaName} Include/Core/Modelica.h )
 
  configure_file (

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

@@ -13,11 +13,11 @@ UMFPACK_LIBS = @SUITESPARSE_UMFPACK_LIBS@
 UMFPACK_INCLUDE = @SUITESPARSE_UMFPACK_INCLUDE_DIR_OMC@
 UMFPACK_LIBS = @UMFPACK_LIBRARIES_@
 
-INTEL_TBB_LIBS = @INTEL_TBB_LIBS@
-INTEL_TBB_INCLUDE = @TBB_INCLUDE_DIRS@
+INTEL_TBB_INCLUDE = @TBB_INCLUDE_DIR_@
+INTEL_TBB_LIBRARIES = @INTEL_TBB_LIBS@
 
-PUGIXML_INCLUDE = @PUGIXML_INCLUDE_DIR@
-PUGIXML_LIBS = @PUGIXML_LIBRARIES@
+PUGIXML_INCLUDE = @PUGIXML_INCLUDE_DIR_@
+PUGIXML_LIBRARIES = @PUGIXML_LIBRARIES@
 
 MODELICA_SYSTEM_LIB_EXT = @MODELICA_SYSTEM_LIB_EXT@
 FMI_ARCH_DIR = @FMI_ARCH_DIR@