- use full path to include ModelicaConfic.inc

- copy LibrariesConfig.h to OM_HOME/include/omc/cpp because this is in include path git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@11815 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 27, 2012 · 6f46409 · 6f46409
1 parent 691577e
commit 6f46409
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Compiler/susan_codegen/SimCode/CodegenCpp.tpl b/Compiler/susan_codegen/SimCode/CodegenCpp.tpl
@@ -127,7 +127,7 @@ let extraCflags = match sopt case SOME(s as SIMULATION_SETTINGS(__)) then
        case "inline-rungekutta" then "-D_OMC_INLINE_RK"%>'
 <<
 # Makefile generated by OpenModelica
-include ModelicaConfic.inc
+include <%makefileParams.omhome%>/bin/ModelicaConfic.inc
 # Simulations use -O3 by default
 SIM_OR_DYNLOAD_OPT_LEVEL=-O3
 CC=<%makefileParams.ccompiler%>

diff --git a/SimulationRuntime/cpp/Source/CMakeLists.txt b/SimulationRuntime/cpp/Source/CMakeLists.txt
@@ -174,7 +174,7 @@ if(INSTALL_OMDEV_LIBS)
   #install (FILES "${Boost_LIBRARIES}"   DESTINATION bin)
 endif()
 
-install (FILES "${PROJECT_BINARY_DIR}/LibrariesConfig.h" DESTINATION bin)
+install (FILES "${PROJECT_BINARY_DIR}/LibrariesConfig.h" DESTINATION include/omc/cpp)
 install (FILES "DataExchange/Interfaces/IHistory.h" 
   DESTINATION include/omc/cpp/DataExchange/Interfaces)