Changeset 28 in pacpusframework

Timestamp:

Jan 8, 2013, 5:28:51 PM (12 years ago)

Author:

sgosseli

Message:

Major: to avoid names collision with other libraries, we should include 'Pacpus/kernel/file.h' instead of 'kernel/file.h'
To work-around this patch, if you use old stuff, you can add in your cmake: include_directories(${PACPUS_INCLUDE_DIR}/Pacpus)

Location:

trunk

Files:

• CMakeLists.txt (modified) (2 diffs)
• cmake/PacpusInstall.cmake (modified) (2 diffs)
• src/DBITEPlayer/CMakeLists.txt (modified) (1 diff)
• src/DBITEPlayerLib/CMakeLists.txt (modified) (2 diffs)
• src/FileLib/CMakeLists.txt (modified) (1 diff)
• src/PacpusLib/CMakeLists.txt (modified) (1 diff)
• src/PacpusTools/CMakeLists.txt (modified) (4 diffs)
• src/RoadTime/CMakeLists.txt (modified) (1 diff)

trunk/CMakeLists.txt

@@ -27 +27 @@
 set(PACPUS_CMAKE_DIR        ${PACPUS_ROOT_DIR}/cmake)
 set(PACPUS_DOC_DIR          ${PACPUS_ROOT_DIR}/doc)
-set(PACPUS_INCLUDE_DIR      ${PACPUS_ROOT_DIR}/include/Pacpus)
+set(PACPUS_INCLUDE_DIR      ${PACPUS_ROOT_DIR}/include/)
 set(PACPUS_SCRIPTS_DIR      ${PACPUS_ROOT_DIR}/scripts)
 set(PACPUS_SOURCE_DIR       ${PACPUS_ROOT_DIR}/src)
@@ -61 +61 @@
 # ========================================
 # Includes directories
-include_directories(${PACPUS_DEPENDENCIES_INC})
-include_directories(${PACPUS_INCLUDE_DIR})
+include_directories(
+  ${PACPUS_DEPENDENCIES_INC}
+  ${PACPUS_INCLUDE_DIR}
+  ${PACPUS_INCLUDE_DIR}/Pacpus
+  # FIXME: remove the include above when all the files are including the right files.
+)
 # Compiler flags coming from PacpusDependencies and PacpusPlatforms
 add_definitions(${PACPUS_DEFINITIONS})

trunk/cmake/PacpusInstall.cmake

@@ -13 +13 @@
 install(
   DIRECTORY
-    ${PACPUS_ROOT_DIR}/cmake
+    ${PACPUS_CMAKE_DIR}
   DESTINATION
     ${PACPUS_INSTALL_DIR}
@@ -25 +25 @@
     ${PACPUS_INCLUDE_DIR}
   DESTINATION
-    ${PACPUS_INSTALL_DIR}/include
+    ${PACPUS_INSTALL_DIR}
 )
 

trunk/src/DBITEPlayer/CMakeLists.txt

@@ -40 +40 @@
 set(
   PROJECT_SRCS
-  ${PACPUS_INCLUDE_DIR}/kernel/cstdint.h
-  ${PACPUS_INCLUDE_DIR}/kernel/ComponentBase.h
-  ${PACPUS_INCLUDE_DIR}/kernel/ComponentFactory.h
-  ${PACPUS_INCLUDE_DIR}/kernel/ComponentFactoryBase.h
-  ${PACPUS_INCLUDE_DIR}/kernel/ComponentManager.h
-  ${PACPUS_INCLUDE_DIR}/kernel/Log.h
-  ${PACPUS_INCLUDE_DIR}/kernel/pacpus.h
-  ${PACPUS_INCLUDE_DIR}/kernel/road_time.h
-  ${PACPUS_INCLUDE_DIR}/kernel/XmlComponentConfig.h
-  ${PACPUS_INCLUDE_DIR}/kernel/XmlConfigFile.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/cstdint.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus//kernel/ComponentBase.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentFactory.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentFactoryBase.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentManager.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/Log.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/pacpus.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/road_time.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/XmlComponentConfig.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/XmlConfigFile.h
   ./ComponentBase.cpp
   ./ComponentFactoryBase.cpp

trunk/src/DBITEPlayerLib/CMakeLists.txt

@@ -46 +46 @@
   ./DbtPlyFileManager.cpp
   ./DbtPlyTrigger.cpp
-  ${PACPUS_INCLUDE_DIR}/DbitePlayer/DbtPlyEngine.h
-  ${PACPUS_INCLUDE_DIR}/DbitePlayer/DbtPlyFileManager.h
-  ${PACPUS_INCLUDE_DIR}/DbitePlayer/DbtPlyTrigger.h
-  ${PACPUS_INCLUDE_DIR}/DbitePlayer/DbtPlyEngineStateChart.h
-  ${PACPUS_INCLUDE_DIR}/DbitePlayer/DbtPlyUserInterface.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyEngine.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyFileManager.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyTrigger.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyEngineStateChart.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyUserInterface.h
 )
 
@@ -58 +58 @@
 set(
   FILES_TO_MOC
-  ${PACPUS_INCLUDE_DIR}/DbitePlayer/DbtPlyEngine.h
-  ${PACPUS_INCLUDE_DIR}/DbitePlayer/DbtPlyFileManager.h
-  ${PACPUS_INCLUDE_DIR}/DbitePlayer/DbtPlyTrigger.h
-  ${PACPUS_INCLUDE_DIR}/DbitePlayer/DbtPlyUserInterface.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyEngine.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyFileManager.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyTrigger.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/DbitePlayer/DbtPlyUserInterface.h
 )
 

trunk/src/FileLib/CMakeLists.txt

@@ -14 +14 @@
 set(
   PROJECT_SRCS
-  ${PACPUS_INCLUDE_DIR}/kernel/DbiteException.h
-  ${PACPUS_INCLUDE_DIR}/kernel/DbiteFile.h
-  ${PACPUS_INCLUDE_DIR}/kernel/DbiteFileTypes.h
-  ${PACPUS_INCLUDE_DIR}/kernel/hdfile_header_t
-  ${PACPUS_INCLUDE_DIR}/kernel/road_time.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/DbiteException.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/DbiteFile.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/DbiteFileTypes.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/hdfile_header_t
+  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/road_time.h
   src/DbiteException.cpp
   src/DbiteFile.cpp

trunk/src/PacpusLib/CMakeLists.txt

@@ -40 +40 @@
 set(
   PROJECT_SRCS
-  ${PACPUS_INCLUDE_DIR}/kernel/cstdint.h
-  ${PACPUS_INCLUDE_DIR}/kernel/ComponentBase.h
-  ${PACPUS_INCLUDE_DIR}/kernel/ComponentFactory.h
-  ${PACPUS_INCLUDE_DIR}/kernel/ComponentFactoryBase.h
-  ${PACPUS_INCLUDE_DIR}/kernel/ComponentManager.h
-  ${PACPUS_INCLUDE_DIR}/kernel/Log.h
-  ${PACPUS_INCLUDE_DIR}/kernel/pacpus.h
-  ${PACPUS_INCLUDE_DIR}/kernel/road_time.h
-  ${PACPUS_INCLUDE_DIR}/kernel/XmlComponentConfig.h
-  ${PACPUS_INCLUDE_DIR}/kernel/XmlConfigFile.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/cstdint.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentBase.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentFactory.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentFactoryBase.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/ComponentManager.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/Log.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/pacpus.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/road_time.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/XmlComponentConfig.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/XmlConfigFile.h
   ./ComponentBase.cpp
   ./ComponentFactoryBase.cpp

trunk/src/PacpusTools/CMakeLists.txt

@@ -38 +38 @@
 set(
   PROJECT_SRCS
-  ${PACPUS_INCLUDE_DIR}/PacpusTools/matrice.h
-  ${PACPUS_INCLUDE_DIR}/PacpusTools/BinaryDecoder.h
-  ${PACPUS_INCLUDE_DIR}/PacpusTools/PosixShMem.h
-  ${PACPUS_INCLUDE_DIR}/PacpusTools/ShMem.h
-  ${PACPUS_INCLUDE_DIR}/PacpusTools/geodesie.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/matrice.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/BinaryDecoder.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PosixShMem.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/ShMem.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/geodesie.h
   ./src/matrice.cpp
   ./src/geodesie.cpp
@@ -54 +54 @@
 set(
   FILES_TO_MOC
-  ${PACPUS_INCLUDE_DIR}/PacpusTools/AsyncWorkerBase.h
-  ${PACPUS_INCLUDE_DIR}/PacpusTools/PeriodicWorker.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/AsyncWorkerBase.h
+  ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PeriodicWorker.h
 )
 
@@ -73 +73 @@
   list(
     APPEND PROJECT_SRCS
-    ${PACPUS_INCLUDE_DIR}/PacpusTools/PosixShMem.h
+    ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PosixShMem.h
     src/PosixShMem.cpp
   )
@@ -81 +81 @@
   list(
     APPEND PROJECT_SRCS
-    ${PACPUS_INCLUDE_DIR}/PacpusTools/Win32ShMem.h
+    ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/Win32ShMem.h
     src/Win32ShMem.cpp
   )

trunk/src/RoadTime/CMakeLists.txt

@@ -14 +14 @@
 add_definitions(
   -DROAD_TIME_EXPORTS
-)
-
-# ========================================
-# Include directories
-# ========================================
-include_directories(
-  ${PACPUS_INCLUDE_DIR}
 )