diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-07-27 15:57:17 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-07-27 15:57:17 (GMT) |
| commit | 507896e03b77842513799b7413afb667fffe9f35 (patch) | |
| tree | c901def26b72d136799296a1c728004e08e177d3 /Modules/Platform | |
| parent | 2745742e090d0d267e130b710ac435540a70cb94 (diff) | |
| download | CMake-507896e03b77842513799b7413afb667fffe9f35.zip CMake-507896e03b77842513799b7413afb667fffe9f35.tar.gz CMake-507896e03b77842513799b7413afb667fffe9f35.tar.bz2 | |
ENH:
-add /usr/openwin/include and /usr/openwin/lib to the default search paths
-add /${CMAKE_INSTALL_PREFIX}/(lib|bin|include) to the default cmake search
paths -> this should help users who install stuff in their home
Alex
Diffstat (limited to 'Modules/Platform')
| -rw-r--r-- | Modules/Platform/UnixPaths.cmake | 9 | ||||
| -rw-r--r-- | Modules/Platform/WindowsPaths.cmake | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake index 8089bad..5ff47f0 100644 --- a/Modules/Platform/UnixPaths.cmake +++ b/Modules/Platform/UnixPaths.cmake @@ -15,8 +15,10 @@ SET(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SYSTEM_INCLUDE_PATH} # Other /opt/local/include /usr/pkg/include - /opt/csw/include /opt/include + /opt/csw/include /opt/include + /usr/openwin/include "${_CMAKE_INSTALL_DIR}/include" + "${CMAKE_INSTALL_PREFIX}/include" ) SET(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} @@ -31,13 +33,16 @@ SET(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} # Other /opt/local/lib /usr/pkg/lib - /opt/csw/lib /opt/lib + /opt/csw/lib /opt/lib + /usr/openwin/lib "${_CMAKE_INSTALL_DIR}/lib" + "${CMAKE_INSTALL_PREFIX}/lib" ) SET(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH} /bin /usr/bin /usr/local/bin /usr/pkg/bin /sbin "${_CMAKE_INSTALL_DIR}/bin" + "${CMAKE_INSTALL_PREFIX}/bin" ) SET(CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES diff --git a/Modules/Platform/WindowsPaths.cmake b/Modules/Platform/WindowsPaths.cmake index 6299775..fda99a2 100644 --- a/Modules/Platform/WindowsPaths.cmake +++ b/Modules/Platform/WindowsPaths.cmake @@ -2,10 +2,10 @@ GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${CMAKE_ROOT}" PATH) GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) SET(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SYSTEM_INCLUDE_PATH} - "$ENV{ProgramFiles}" "${_CMAKE_INSTALL_DIR}/include") + "$ENV{ProgramFiles}" "${CMAKE_INSTALL_PREFIX}/include" "${_CMAKE_INSTALL_DIR}/include") SET(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} - "$ENV{ProgramFiles}" "${_CMAKE_INSTALL_DIR}/lib" "${_CMAKE_INSTALL_DIR}/bin") + "$ENV{ProgramFiles}" "${CMAKE_INSTALL_PREFIX}/lib" "${CMAKE_INSTALL_PREFIX}/bin" "${_CMAKE_INSTALL_DIR}/lib" "${_CMAKE_INSTALL_DIR}/bin") SET(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH} - "$ENV{ProgramFiles}" "${_CMAKE_INSTALL_DIR}/bin") + "$ENV{ProgramFiles}" "${CMAKE_INSTALL_PREFIX}/bin" "${_CMAKE_INSTALL_DIR}/bin") |