diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-08-09 18:45:23 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-08-09 18:45:23 (GMT) |
| commit | 176fe63d151d60e90edd4bd01eaac7d1b74241cd (patch) | |
| tree | d6967d87757696ce05396c62f75e98da63f9b91c /Modules/Platform | |
| parent | 9bd32386c266c906c1a4c02964dfa68292c4ab12 (diff) | |
| download | CMake-176fe63d151d60e90edd4bd01eaac7d1b74241cd.zip CMake-176fe63d151d60e90edd4bd01eaac7d1b74241cd.tar.gz CMake-176fe63d151d60e90edd4bd01eaac7d1b74241cd.tar.bz2 | |
ENH: UNIX, CYGWIN, WIN32, APPLE, QNXNTO and BEOS are not longer set in
cmMakefile.cxx, but now in the platform files and are now valid for the
target platform, not the host platform.
New variables CMAKE_HOST_WIN32, CMAKE_HOST_UNIX, CMAKE_HOST_APPLE and
CMAKE_HOST_CYGWIN have been added in cmMakefile.cxx (...and have now to be
used in all cmake files which are executed before
CMakeSystemSpecificInformation.cmake is loaded). For compatibility the old
set is set to the new one in CMakeDetermineSystem.cmake and reset before the
system platform files are loaded, so custom language or compiler modules
which use these should still work.
Alex
Diffstat (limited to 'Modules/Platform')
| -rw-r--r-- | Modules/Platform/BeOS.cmake | 2 | ||||
| -rw-r--r-- | Modules/Platform/CYGWIN.cmake | 3 | ||||
| -rw-r--r-- | Modules/Platform/Darwin.cmake | 2 | ||||
| -rw-r--r-- | Modules/Platform/QNX.cmake | 2 | ||||
| -rw-r--r-- | Modules/Platform/UnixPaths.cmake | 2 | ||||
| -rw-r--r-- | Modules/Platform/Windows.cmake | 2 |
6 files changed, 13 insertions, 0 deletions
diff --git a/Modules/Platform/BeOS.cmake b/Modules/Platform/BeOS.cmake index 13c4016..0cbb90f 100644 --- a/Modules/Platform/BeOS.cmake +++ b/Modules/Platform/BeOS.cmake @@ -1,3 +1,5 @@ +SET(BEOS 1) + # GCC is the default compiler on BeOS. INCLUDE(${CMAKE_ROOT}/Modules/Platform/gcc.cmake) diff --git a/Modules/Platform/CYGWIN.cmake b/Modules/Platform/CYGWIN.cmake index 89c3453..c9170a0 100644 --- a/Modules/Platform/CYGWIN.cmake +++ b/Modules/Platform/CYGWIN.cmake @@ -1,3 +1,6 @@ +SET(WIN32 1) +SET(CYGWIN 1) + SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared -Wl,--export-all-symbols -Wl,--enable-auto-import") SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS}) SET(CMAKE_DL_LIBS "-lgdi32" ) diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake index 9aa36af..39a5412 100644 --- a/Modules/Platform/Darwin.cmake +++ b/Modules/Platform/Darwin.cmake @@ -1,3 +1,5 @@ +SET(APPLE 1) + SET(CMAKE_SHARED_LIBRARY_PREFIX "lib") SET(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib") SET(CMAKE_SHARED_MODULE_PREFIX "lib") diff --git a/Modules/Platform/QNX.cmake b/Modules/Platform/QNX.cmake index 6c38af1..5c45ef4 100644 --- a/Modules/Platform/QNX.cmake +++ b/Modules/Platform/QNX.cmake @@ -1,3 +1,5 @@ +SET(QNXNTO 1) + # GCC is the default compiler on QNX 6.3. INCLUDE(${CMAKE_ROOT}/Modules/Platform/gcc.cmake) diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake index 5ff47f0..22c9a86 100644 --- a/Modules/Platform/UnixPaths.cmake +++ b/Modules/Platform/UnixPaths.cmake @@ -1,3 +1,5 @@ +SET(UNIX 1) + # also add the install directory of the running cmake to the search directories # CMAKE_ROOT is CMAKE_INSTALL_PREFIX/share/cmake, so we need to go two levels up GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${CMAKE_ROOT}" PATH) diff --git a/Modules/Platform/Windows.cmake b/Modules/Platform/Windows.cmake index bf958d9..09cb8d3 100644 --- a/Modules/Platform/Windows.cmake +++ b/Modules/Platform/Windows.cmake @@ -1,3 +1,5 @@ +SET(WIN32 1) + SET(CMAKE_STATIC_LIBRARY_PREFIX "") SET(CMAKE_STATIC_LIBRARY_SUFFIX ".lib") SET(CMAKE_SHARED_LIBRARY_PREFIX "") # lib |