[cmake-commits] hoffman committed CMakeLists.txt 1.12.2.1 1.12.2.2

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Utilities/cmtar
In directory public:/mounts/ram/cvs-serv31017/Utilities/cmtar

Modified Files:
      Tag: CMake-2-4
	CMakeLists.txt 
Log Message:
ENH: merge changes from the main tree to the 2.4 branch


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmtar/CMakeLists.txt,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -d -r1.12.2.1 -r1.12.2.2
--- CMakeLists.txt	30 Jun 2006 17:48:48 -0000	1.12.2.1
+++ CMakeLists.txt	13 Oct 2006 14:52:16 -0000	1.12.2.2
@@ -6,6 +6,11 @@
 SET(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
 SET(CMAKE_REQUIRED_FLAGS ${CMAKE_ANSI_CFLAGS})
 
+# Disable warnings on Borland to avoid changing 3rd party code.
+IF(BORLAND)
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w-")
+ENDIF(BORLAND)
+
 # If we are on AIX, do the _ALL_SOURCE magic
 IF(${CMAKE_SYSTEM_NAME} MATCHES AIX)
   SET(_ALL_SOURCE 1)
@@ -231,7 +236,13 @@
 #SET (HAVE_UNISTD_H 1)
 SET (MAJOR_IN_MKDEV 0)
 SET (MAJOR_IN_SYSMACROS 0)
+
+# for most systems makedev is two args on qnx it is three
+# try run is nothing but trouble so just hard code it 
 SET (MAKEDEV_THREE_ARGS 0)
+IF(QNXNTO)
+  SET(MAKEDEV_THREE_ARGS 1)
+ENDIF(QNXNTO)
 #SET (NEED_BASENAME 0)
 #SET (NEED_DIRNAME 0)
 #SET (NEED_FNMATCH 1)