[cmake-commits] alex committed AIX.cmake 1.17 1.18 BSDOS.cmake 1.4 1.5 BeOS.cmake 1.2 1.3 MP-RAS.cmake 1.5 1.6 QNX.cmake 1.7 1.8 RISCos.cmake 1.5 1.6

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Aug 10 08:54:44 EDT 2007


Update of /cvsroot/CMake/CMake/Modules/Platform
In directory public:/mounts/ram/cvs-serv3008

Modified Files:
	AIX.cmake BSDOS.cmake BeOS.cmake MP-RAS.cmake QNX.cmake 
	RISCos.cmake 
Log Message:

BUG: also include UnixPaths.cmake on these platforms, this also sets UNIX to 1

Alex


Index: RISCos.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/RISCos.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- RISCos.cmake	22 Sep 2004 18:42:05 -0000	1.5
+++ RISCos.cmake	10 Aug 2007 12:54:42 -0000	1.6
@@ -2,3 +2,5 @@
 SET(CMAKE_SHARED_LIBRARY_SUFFIX "..o")
 SET(CMAKE_DL_LIBS "")
 SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-Wl,-D,08000000")
+
+INCLUDE(Platform/UnixPaths)

Index: QNX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/QNX.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- QNX.cmake	9 Aug 2007 18:45:23 -0000	1.7
+++ QNX.cmake	10 Aug 2007 12:54:42 -0000	1.8
@@ -1,7 +1,7 @@
 SET(QNXNTO 1)
 
 # GCC is the default compiler on QNX 6.3.
-INCLUDE(${CMAKE_ROOT}/Modules/Platform/gcc.cmake)
+INCLUDE(Platform/gcc)
 
 # The QNX GCC does not seem to have -isystem so remove the flag.
 SET(CMAKE_INCLUDE_SYSTEM_FLAG_C)
@@ -29,3 +29,5 @@
 # force the language to be c++ since qnx only has gcc and not g++ and c++?
 SET(CMAKE_CXX_COMPILE_OBJECT
   "<CMAKE_CXX_COMPILER> -x c++ <FLAGS> -o <OBJECT> -c <SOURCE>")
+
+INCLUDE(Platform/UnixPaths)

Index: BSDOS.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/BSDOS.cmake,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- BSDOS.cmake	26 Aug 2004 18:55:54 -0000	1.4
+++ BSDOS.cmake	10 Aug 2007 12:54:42 -0000	1.5
@@ -1 +1,2 @@
+INCLUDE(Platform/UnixPaths)
 

Index: BeOS.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/BeOS.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- BeOS.cmake	9 Aug 2007 18:45:23 -0000	1.2
+++ BeOS.cmake	10 Aug 2007 12:54:42 -0000	1.3
@@ -10,3 +10,5 @@
 SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
 SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
 SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
+
+INCLUDE(Platform/UnixPaths)

Index: AIX.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/AIX.cmake,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- AIX.cmake	21 Feb 2007 16:45:38 -0000	1.17
+++ AIX.cmake	10 Aug 2007 12:54:42 -0000	1.18
@@ -57,3 +57,5 @@
 #  SET(CMAKE_${type}_LINK_STATIC_C_FLAGS "-bstatic")
 #  SET(CMAKE_${type}_LINK_DYNAMIC_C_FLAGS "-bdynamic")
 #ENDFOREACH(type)
+
+INCLUDE(Platform/UnixPaths)

Index: MP-RAS.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/MP-RAS.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- MP-RAS.cmake	22 Sep 2004 18:42:05 -0000	1.5
+++ MP-RAS.cmake	10 Aug 2007 12:54:42 -0000	1.6
@@ -5,5 +5,6 @@
   SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-Wl,-Bexport")
 ENDIF(CMAKE_SYSTEM MATCHES "MP-RAS-02*.")
 
+INCLUDE(Platform/UnixPaths)
 
 



More information about the Cmake-commits mailing list