Changeset b5b95099 in OpenModelica

Timestamp:

2020-10-21T14:04:15+02:00 (3 years ago)

Author:

Mahder Gebremedhin <mahder.gebremedhin@…>

Children:

7e573177

Parents:

6f81d96

git-author:

Mahder Gebremedhin <mahder.gebremedhin@…> (07/12/20 20:34:31)

git-committer:

Mahder Gebremedhin <mahder.gebremedhin@…> (10/21/20 14:04:15)

Message:

[cmake] Relative OpenModelicaBootstrappingHeader.h

• Fix OpenModelicaBootstrappingHeader inclusion on Parser/. If OMC_BOOTSTRAPPING is defined include it from Compiler/boot/tarball-include. Otherwise include it from Compiler/.

• Some target_include_directories are not needed anymore. include directory propagation is managed by what libraries a target links to, i.e., cmake will automatically propagate the public include directories of a given library when the library is linked to some other target.

Location:

OMCompiler

Files:

• Compiler/runtime/CMakeLists.txt (modified) (2 diffs)
• Parser/CMakeLists.txt (modified) (2 diffs)
• Parser/Modelica.g (modified) (1 diff)
• SimulationRuntime/c/CMakeLists.txt (modified) (1 diff)

OMCompiler/Compiler/runtime/CMakeLists.txt

@@ -28 +28 @@
 # target_link_libraries(omcruntime PUBLIC omc::3rd::gc)
 
+target_include_directories(omcruntime INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 target_include_directories(omcruntime PRIVATE ${OMCompiler_SOURCE_DIR}) #for revision.h
 
@@ -45 +46 @@
 target_link_libraries(omcbackendruntime PUBLIC omc::3rd::gc)
 
+target_include_directories(omcbackendruntime INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 target_include_directories(omcbackendruntime PRIVATE ${OMCompiler_SOURCE_DIR}) #for revision.h
 

OMCompiler/Parser/CMakeLists.txt

@@ -43 +43 @@
 target_include_directories(omparse PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
-target_include_directories(omparse PUBLIC ${OMCompiler_SOURCE_DIR}/Compiler) #for OpenModelicaBootstrappingHeader.h :/
-target_include_directories(omparse PUBLIC ${OMCompiler_SOURCE_DIR}/Compiler/runtime) #for systemimpl.h :/
-target_include_directories(omparse PUBLIC ${SimulationRuntimeC_SOURCE_DIR}) #for openmodelica.h :/
-target_include_directories(omparse PUBLIC ${OMCompiler_SOURCE_DIR}) #for revision.h, openmodelica.h :/
+target_include_directories(omparse PRIVATE ${OMCompiler_SOURCE_DIR}) #for revision.h :/
 ######################### end libomparser ###########################
 
@@ -65 +62 @@
 target_include_directories(omparse-boot PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
-target_include_directories(omparse-boot PUBLIC ${OMCompiler_SOURCE_DIR}/Compiler) #for OpenModelicaBootstrappingHeader.h :/
-target_include_directories(omparse-boot PUBLIC ${OMCompiler_SOURCE_DIR}/Compiler/runtime) #for systemimpl.h :/
-target_include_directories(omparse-boot PUBLIC ${SimulationRuntimeC_SOURCE_DIR}) #for openmodelica.h :/
-target_include_directories(omparse-boot PUBLIC ${OMCompiler_SOURCE_DIR}) #for revision.h
+target_include_directories(omparse-boot PRIVATE ${OMCompiler_SOURCE_DIR}) #for revision.h
 ######################### end libomparser-boot ###########################

OMCompiler/Parser/Modelica.g

@@ -198 +198 @@
 
   #if !defined(OMJULIA)
-  #include "meta/meta_modelica.h"
-  #include "OpenModelicaBootstrappingHeader.h"
-  parser_members members;
-  void* mmc_mk_box_eat_all(int ix, ...) {return NULL;}
-  #if defined(OMC_BOOTSTRAPPING)
-  #endif
+    #include "meta/meta_modelica.h"
+    #if defined(OMC_BOOTSTRAPPING)
+      #include "../Compiler/boot/tarball-include/OpenModelicaBootstrappingHeader.h"
+    #else
+      #include "../Compiler/OpenModelicaBootstrappingHeader.h"
+    #endif
+    parser_members members;
+    void* mmc_mk_box_eat_all(int ix, ...) {return NULL;}
   #else /* Julia */
-  #include "OpenModelicaJuliaHeader.h"
-  #include "MetaModelicaJuliaLayer.h"
+    #include "OpenModelicaJuliaHeader.h"
+    #include "MetaModelicaJuliaLayer.h"
   #endif
 }

OMCompiler/SimulationRuntime/c/CMakeLists.txt

@@ -28 +28 @@
 # target_link_libraries(OpenModelicaRuntimeC PUBLIC $<$<CXX_COMPILER_ID:gcc>:dbghelp>)
 
-target_include_directories(OpenModelicaRuntimeC PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(OpenModelicaRuntimeC INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})