Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7225 for code/trunk/cmake


Ignore:
Timestamp:
Aug 26, 2010, 3:02:27 PM (14 years ago)
Author:
rgrieder
Message:

Extended search paths for dependencies. You should now be able to host dependencies in one of theses fashions:
dependencies/version.txt
dependencies/msvc8/version.txt
dependencies/msvc8/dependencies/version.txt
This allows to have different header files for different compilers.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/cmake/LibraryConfig.cmake

    r7224 r7225  
    5252IF(DEPENDENCY_PACKAGE_ENABLE)
    5353  GET_FILENAME_COMPONENT(_dep_dir_1 ${CMAKE_SOURCE_DIR}/../dependencies ABSOLUTE)
    54   GET_FILENAME_COMPONENT(_dep_dir_2 ${CMAKE_SOURCE_DIR}/../lib_dist/dependencies ABSOLUTE)
     54  GET_FILENAME_COMPONENT(_dep_dir_2 ${CMAKE_SOURCE_DIR}/../lib_dist ABSOLUTE)
     55  IF(MINGW)
     56    SET(_compiler_prefix mingw)
     57  ELSEIF(MSVC80)
     58    SET(_compiler_prefix msvc8)
     59  ELSEIF(MSVC90)
     60    SET(_compiler_prefix msvc9)
     61  ENDIF()
    5562  FIND_PATH(DEPENDENCY_PACKAGE_DIR
    56     NAMES include
     63    NAMES version.txt
    5764    PATHS
    5865      ${CMAKE_SOURCE_DIR}/dependencies
    5966      ${_dep_dir_1}
    6067      ${_dep_dir_2}
     68    PATH_SUFFIXES ${_compiler_prefix} ${_compiler_prefix}/dependencies
    6169    NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH
    6270  )
Note: See TracChangeset for help on using the changeset viewer.