summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2006-08-04 14:35:45 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2006-08-04 14:35:45 (GMT)
commit783f2003ecbc50a4155231b7afaa2c5f1b8b0c3c (patch)
tree6be8f30bc2db503a4bc8307e2b8089fc2dc592c0
parentf3a3f1fb667a65c262a06aab51be21b6163e3ac5 (diff)
downloadCMake-783f2003ecbc50a4155231b7afaa2c5f1b8b0c3c.zip
CMake-783f2003ecbc50a4155231b7afaa2c5f1b8b0c3c.tar.gz
CMake-783f2003ecbc50a4155231b7afaa2c5f1b8b0c3c.tar.bz2
ENH: give up on try run
-rw-r--r--Utilities/cmtar/CMakeLists.txt36
1 files changed, 6 insertions, 30 deletions
diff --git a/Utilities/cmtar/CMakeLists.txt b/Utilities/cmtar/CMakeLists.txt
index 632d2a1..a54e629 100644
--- a/Utilities/cmtar/CMakeLists.txt
+++ b/Utilities/cmtar/CMakeLists.txt
@@ -237,36 +237,12 @@ SET (HAVE_LIBZ 1)
SET (MAJOR_IN_MKDEV 0)
SET (MAJOR_IN_SYSMACROS 0)
-SET(CMAKE_MAKEDEV_SOURCE)
-FOREACH(FILE ${HEADER_INCLUDES})
- SET(CMAKE_MAKEDEV_SOURCE
- "${CMAKE_MAKEDEV_SOURCE}#include <${FILE}>\n")
-ENDFOREACH(FILE)
-SET(CMAKE_MAKEDEV_SOURCE
- "${CMAKE_MAKEDEV_SOURCE}
-int main ()
-{
- dev_t maj = 5;
- dev_t min = 7;
- dev_t dev;
-
- dev = makedev(0, maj, min);
- if(major(dev) != maj || minor(dev) != min)
- {
- return 1;
- }
- return 0;
-}
-")
-# get this from the source tree since it was not in the previous
-# version of cmake and cmake need to build cmake
-IF("${CMake_SOURCE_DIR}" STREQUAL "")
- INCLUDE(CheckCSourceRuns)
-ELSE("${CMake_SOURCE_DIR}" STREQUAL "")
- INCLUDE(${CMake_SOURCE_DIR}/Modules/CheckCSourceRuns.cmake)
-ENDIF("${CMake_SOURCE_DIR}" STREQUAL "")
-CHECK_C_SOURCE_RUNS("${CMAKE_MAKEDEV_SOURCE}" MAKEDEV_THREE_ARGS)
-#SET (MAKEDEV_THREE_ARGS 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)