Changeset 28 in pacpusframework for trunk/src/PacpusTools

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)

File:

• trunk/src/PacpusTools/CMakeLists.txt (modified) (4 diffs)

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
   )