Changeset 28 in pacpusframework for trunk/CMakeLists.txt

Timestamp:

01/08/13 17:28:51 (11 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/CMakeLists.txt (modified) (2 diffs)

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})