Changeset 7510 for code/branches

Timestamp:

Oct 7, 2010, 11:12:05 PM (14 years ago)

Author:

rgrieder

Message:

Fixed something I should have seen a long time ago: Order of include directory of course matters.
In this particular case, including enet/enet.h from the system directory gets fixed with this to use the local one.

File:

• code/branches/ois_update/src/CMakeLists.txt (modified) (2 diffs)

code/branches/ois_update/src/CMakeLists.txt

@@ -70 +70 @@
 # Set the search paths for include files
 INCLUDE_DIRECTORIES(
+  # OrxonoxConfig.h
+  ${CMAKE_CURRENT_BINARY_DIR}
+
+  # All includes in "externals" should be prefixed with the path
+  # relative to "external" to avoid conflicts
+  ${CMAKE_CURRENT_SOURCE_DIR}/external
+  # Include directories needed even if only included by Orxonox
+  ${CMAKE_CURRENT_SOURCE_DIR}/external/bullet
+  ${CMAKE_CURRENT_SOURCE_DIR}/external/ois
+
   # External
   ${OGRE_INCLUDE_DIR}
@@ -85 +95 @@
   ${ZLIB_INCLUDE_DIR}
   ${VLD_INCLUDE_DIR}
-
-  # All includes in "externals" should be prefixed with the path
-  # relative to "external" to avoid conflicts
-  ${CMAKE_CURRENT_SOURCE_DIR}/external
-  # Include directories needed even if only included by Orxonox
-  ${CMAKE_CURRENT_SOURCE_DIR}/external/bullet
-  ${CMAKE_CURRENT_SOURCE_DIR}/external/ois
-
-  # OrxonoxConfig.h
-  ${CMAKE_CURRENT_BINARY_DIR}
 )