Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/ois_update/src/CMakeLists.txt

    r7459 r7510  
    7070# Set the search paths for include files
    7171INCLUDE_DIRECTORIES(
     72  # OrxonoxConfig.h
     73  ${CMAKE_CURRENT_BINARY_DIR}
     74
     75  # All includes in "externals" should be prefixed with the path
     76  # relative to "external" to avoid conflicts
     77  ${CMAKE_CURRENT_SOURCE_DIR}/external
     78  # Include directories needed even if only included by Orxonox
     79  ${CMAKE_CURRENT_SOURCE_DIR}/external/bullet
     80  ${CMAKE_CURRENT_SOURCE_DIR}/external/ois
     81
    7282  # External
    7383  ${OGRE_INCLUDE_DIR}
     
    8595  ${ZLIB_INCLUDE_DIR}
    8696  ${VLD_INCLUDE_DIR}
    87 
    88   # All includes in "externals" should be prefixed with the path
    89   # relative to "external" to avoid conflicts
    90   ${CMAKE_CURRENT_SOURCE_DIR}/external
    91   # Include directories needed even if only included by Orxonox
    92   ${CMAKE_CURRENT_SOURCE_DIR}/external/bullet
    93   ${CMAKE_CURRENT_SOURCE_DIR}/external/ois
    94 
    95   # OrxonoxConfig.h
    96   ${CMAKE_CURRENT_BINARY_DIR}
    9797)
    9898
Note: See TracChangeset for help on using the changeset viewer.