summaryrefslogtreecommitdiffstats
path: root/Modules/Platform/WindowsPaths.cmake
diff options
context:
space:
mode:
authorAlexander Neundorf <neundorf@kde.org>2007-07-17 12:51:45 (GMT)
committerAlexander Neundorf <neundorf@kde.org>2007-07-17 12:51:45 (GMT)
commit57f25c53e3bbbbda97a7e58fac27c1c56bc1f03a (patch)
treeb34bd8fe59e9140fe247a5c8d2c1e6cc1c76fc03 /Modules/Platform/WindowsPaths.cmake
parent7eb86d1e3cd69d8e23709b1bfd17f7a3f1ba6166 (diff)
downloadCMake-57f25c53e3bbbbda97a7e58fac27c1c56bc1f03a.zip
CMake-57f25c53e3bbbbda97a7e58fac27c1c56bc1f03a.tar.gz
CMake-57f25c53e3bbbbda97a7e58fac27c1c56bc1f03a.tar.bz2
ENH: also look in the include/, lib/ and bin/ directories in the cmake
install dir under windows, this will help e.g. people using kdewininstaller and similar setups Alex
Diffstat (limited to 'Modules/Platform/WindowsPaths.cmake')
-rw-r--r--Modules/Platform/WindowsPaths.cmake14
1 files changed, 11 insertions, 3 deletions
diff --git a/Modules/Platform/WindowsPaths.cmake b/Modules/Platform/WindowsPaths.cmake
index dbd195e..6299775 100644
--- a/Modules/Platform/WindowsPaths.cmake
+++ b/Modules/Platform/WindowsPaths.cmake
@@ -1,3 +1,11 @@
-SET(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SYSTEM_INCLUDE_PATH} "$ENV{ProgramFiles}")
-SET(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} "$ENV{ProgramFiles}")
-SET(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH} "$ENV{ProgramFiles}")
+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")
+
+SET(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH}
+ "$ENV{ProgramFiles}" "${_CMAKE_INSTALL_DIR}/lib" "${_CMAKE_INSTALL_DIR}/bin")
+
+SET(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
+ "$ENV{ProgramFiles}" "${_CMAKE_INSTALL_DIR}/bin")