Browse Source

BUG: Fix try-compile for sys/prctl.h. It needs to include sys/types.h first according to the man page.

Brad King 21 years ago
parent
commit
c6e15f5ddf
2 changed files with 5 additions and 2 deletions
  1. 3 1
      Modules/CMakeBackwardCompatibilityC.cmake
  2. 2 1
      Modules/FindThreads.cmake

+ 3 - 1
Modules/CMakeBackwardCompatibilityC.cmake

@@ -21,9 +21,11 @@ IF(NOT CMAKE_SKIP_COMPATIBILITY_TESTS)
   INCLUDE (CheckIncludeFile)
   CHECK_INCLUDE_FILE("limits.h"       CMAKE_HAVE_LIMITS_H)
   CHECK_INCLUDE_FILE("unistd.h"       CMAKE_HAVE_UNISTD_H)
-  CHECK_INCLUDE_FILE("sys/prctl.h"    CMAKE_HAVE_SYS_PRCTL_H)
   CHECK_INCLUDE_FILE("pthread.h"      CMAKE_HAVE_PTHREAD_H)
 
+  INCLUDE (CheckIncludeFiles)
+  CHECK_INCLUDE_FILES("sys/types.h;sys/prctl.h"    CMAKE_HAVE_SYS_PRCTL_H)
+
   INCLUDE (TestBigEndian)
   TEST_BIG_ENDIAN(CMAKE_WORDS_BIGENDIAN)
   INCLUDE (FindX11)

+ 2 - 1
Modules/FindThreads.cmake

@@ -7,11 +7,12 @@
 # CMAKE_HP_PTHREADS_INIT             - are we using hp pthreads
 
 INCLUDE (CheckIncludeFile)
+INCLUDE (CheckIncludeFiles)
 INCLUDE (CheckLibraryExists)
 
 # Do we have sproc?
 IF(CMAKE_SYSTEM MATCHES IRIX)
-  CHECK_INCLUDE_FILE("sys/prctl.h"  CMAKE_HAVE_SPROC_H)
+  CHECK_INCLUDE_FILES("sys/types.h;sys/prctl.h"  CMAKE_HAVE_SPROC_H)
 ENDIF(CMAKE_SYSTEM MATCHES IRIX)
 
 IF(CMAKE_HAVE_SPROC_H)