diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-08-02 15:17:32 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-08-02 15:17:32 (GMT) |
| commit | dac7814841a09d80b75eba37ac50aa9ae17ced19 (patch) | |
| tree | 09537d5373d876a15e4cb08db9406f58dcdf4792 | |
| parent | cd6abe486d271940719c673dd5e75f911f428dbd (diff) | |
| download | CMake-dac7814841a09d80b75eba37ac50aa9ae17ced19.zip CMake-dac7814841a09d80b75eba37ac50aa9ae17ced19.tar.gz CMake-dac7814841a09d80b75eba37ac50aa9ae17ced19.tar.bz2 | |
ENH: use WindowsPaths.cmake on all Windows platforms, not only for cl, makes
the mingw cross compiler work out of the box and should help mingw users on
windows with a common install dir
Alex
| -rw-r--r-- | Modules/Platform/Windows-cl.cmake | 1 | ||||
| -rw-r--r-- | Modules/Platform/Windows.cmake | 4 | ||||
| -rw-r--r-- | Modules/Platform/WindowsPaths.cmake | 12 |
3 files changed, 11 insertions, 6 deletions
diff --git a/Modules/Platform/Windows-cl.cmake b/Modules/Platform/Windows-cl.cmake index 658a1e3..0c8e718 100644 --- a/Modules/Platform/Windows-cl.cmake +++ b/Modules/Platform/Windows-cl.cmake @@ -271,4 +271,3 @@ IF(NOT EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCXXPlatform.cmake") ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCXXPlatform.cmake IMMEDIATE) ENDIF(NOT EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCXXPlatform.cmake") -INCLUDE(Platform/WindowsPaths) diff --git a/Modules/Platform/Windows.cmake b/Modules/Platform/Windows.cmake index 43605fb..bf958d9 100644 --- a/Modules/Platform/Windows.cmake +++ b/Modules/Platform/Windows.cmake @@ -25,10 +25,10 @@ IF(CMAKE_GENERATOR MATCHES "NMake") SET(CMAKE_END_TEMP_FILE "\n<<") ENDIF(CMAKE_GENERATOR MATCHES "NMake") +INCLUDE(Platform/WindowsPaths) + # uncomment these out to debug nmake and borland makefiles #SET(CMAKE_START_TEMP_FILE "") #SET(CMAKE_END_TEMP_FILE "") #SET(CMAKE_VERBOSE_MAKEFILE 1) - - diff --git a/Modules/Platform/WindowsPaths.cmake b/Modules/Platform/WindowsPaths.cmake index fda99a2..11fc630 100644 --- a/Modules/Platform/WindowsPaths.cmake +++ b/Modules/Platform/WindowsPaths.cmake @@ -1,11 +1,17 @@ GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${CMAKE_ROOT}" PATH) GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) +# the /bin, /lib and /include dirs are mainly for mingw cross compiler users +# under Linux who use CMAKE_FIND_ROOT_PATH SET(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SYSTEM_INCLUDE_PATH} - "$ENV{ProgramFiles}" "${CMAKE_INSTALL_PREFIX}/include" "${_CMAKE_INSTALL_DIR}/include") + "$ENV{ProgramFiles}" "${CMAKE_INSTALL_PREFIX}/include" "${_CMAKE_INSTALL_DIR}/include" /include) +# mingw can also link against dlls which can also be in /bin, so list this too SET(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} - "$ENV{ProgramFiles}" "${CMAKE_INSTALL_PREFIX}/lib" "${CMAKE_INSTALL_PREFIX}/bin" "${_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" + /lib /bin ) SET(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH} - "$ENV{ProgramFiles}" "${CMAKE_INSTALL_PREFIX}/bin" "${_CMAKE_INSTALL_DIR}/bin") + "$ENV{ProgramFiles}" "${CMAKE_INSTALL_PREFIX}/bin" "${_CMAKE_INSTALL_DIR}/bin" /bin) |