Changeset 8071 for code/branches/kicklib/src/CMakeLists.txt

Timestamp:

Mar 14, 2011, 3:53:38 AM (14 years ago)

Author:

rgrieder

Message:

Merged ois_update branch (before it was renamed to mac_osx) into kicklib branch.

Location:

code/branches/kicklib

Files:

• . (modified) (1 prop)
• src/CMakeLists.txt (modified) (2 diffs)

code/branches/kicklib/src/CMakeLists.txt

@@ -69 +69 @@
 # 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}
@@ -84 +94 @@
   ${DIRECTX_INCLUDE_DIR}
   ${ZLIB_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}
 )