[cmake-commits] alex committed BeOS.cmake 1.1 1.2 CYGWIN.cmake 1.19
1.20 Darwin.cmake 1.32 1.33 QNX.cmake 1.6 1.7 UnixPaths.cmake
1.10 1.11 Windows.cmake 1.7 1.8
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Aug 9 14:45:25 EDT 2007
Update of /cvsroot/CMake/CMake/Modules/Platform
In directory public:/mounts/ram/cvs-serv23745/Modules/Platform
Modified Files:
BeOS.cmake CYGWIN.cmake Darwin.cmake QNX.cmake UnixPaths.cmake
Windows.cmake
Log Message:
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
Index: Windows.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Windows.cmake 2 Aug 2007 15:17:32 -0000 1.7
+++ Windows.cmake 9 Aug 2007 18:45:23 -0000 1.8
@@ -1,3 +1,5 @@
+SET(WIN32 1)
+
SET(CMAKE_STATIC_LIBRARY_PREFIX "")
SET(CMAKE_STATIC_LIBRARY_SUFFIX ".lib")
SET(CMAKE_SHARED_LIBRARY_PREFIX "") # lib
Index: QNX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/QNX.cmake,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- QNX.cmake 18 Apr 2007 04:11:47 -0000 1.6
+++ QNX.cmake 9 Aug 2007 18:45:23 -0000 1.7
@@ -1,3 +1,5 @@
+SET(QNXNTO 1)
+
# GCC is the default compiler on QNX 6.3.
INCLUDE(${CMAKE_ROOT}/Modules/Platform/gcc.cmake)
Index: BeOS.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/BeOS.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BeOS.cmake 7 Dec 2006 21:14:09 -0000 1.1
+++ BeOS.cmake 9 Aug 2007 18:45:23 -0000 1.2
@@ -1,3 +1,5 @@
+SET(BEOS 1)
+
# GCC is the default compiler on BeOS.
INCLUDE(${CMAKE_ROOT}/Modules/Platform/gcc.cmake)
Index: CYGWIN.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/CYGWIN.cmake,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- CYGWIN.cmake 19 Mar 2007 14:00:35 -0000 1.19
+++ CYGWIN.cmake 9 Aug 2007 18:45:23 -0000 1.20
@@ -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" )
Index: UnixPaths.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/UnixPaths.cmake,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- UnixPaths.cmake 27 Jul 2007 15:57:17 -0000 1.10
+++ UnixPaths.cmake 9 Aug 2007 18:45:23 -0000 1.11
@@ -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)
Index: Darwin.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Darwin.cmake,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- Darwin.cmake 4 Jun 2007 21:08:46 -0000 1.32
+++ Darwin.cmake 9 Aug 2007 18:45:23 -0000 1.33
@@ -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")
More information about the Cmake-commits
mailing list