[Orxonox-commit 2807] r7510 - code/branches/ois_update/src

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-10-07 23:12:05 +0200 (Thu, 07 Oct 2010)
New Revision: 7510

Modified:
   code/branches/ois_update/src/CMakeLists.txt
Log:
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.

Modified: code/branches/ois_update/src/CMakeLists.txt
===================================================================
--- code/branches/ois_update/src/CMakeLists.txt	2010-10-07 19:30:12 UTC (rev 7509)
+++ code/branches/ois_update/src/CMakeLists.txt	2010-10-07 21:12:05 UTC (rev 7510)
@@ -69,6 +69,16 @@
 
 # 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}
   ${CEGUI_INCLUDE_DIR}
@@ -84,16 +94,6 @@
   ${DIRECTX_INCLUDE_DIR}
   ${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}
 )
 
 IF(CEGUILUA_USE_INTERNAL_LIBRARY)