[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.148.2.1 1.148.2.2 Configure.h.in 1.14.4.1 1.14.4.2 FundamentalType.h.in 1.2.8.1 1.2.8.2 MD5.c 1.3.4.1 1.3.4.2 ProcessUNIX.c 1.87.4.2 1.87.4.3 ProcessWin32.c 1.70.4.1 1.70.4.2 SharedForward.h.in 1.15.4.1 1.15.4.2 String.hxx.in 1.3.28.1 1.3.28.2 SystemInformation.cxx 1.45.6.2 1.45.6.3 SystemInformation.hxx.in 1.9.8.1 1.9.8.2 SystemTools.cxx 1.252.2.2 1.252.2.3 kwsysPlatformTests.cmake 1.2.76.1 1.2.76.2 kwsysPlatformTestsC.c 1.2.76.1 1.2.76.2 kwsysPlatformTestsCXX.cxx 1.5.4.1 1.5.4.2
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Jan 28 16:48:05 EST 2010
Update of /cvsroot/CMake/CMake/Source/kwsys
In directory public:/mounts/ram/cvs-serv23913/Source/kwsys
Modified Files:
Tag: CMake-2-8
CMakeLists.txt Configure.h.in FundamentalType.h.in MD5.c
ProcessUNIX.c ProcessWin32.c SharedForward.h.in String.hxx.in
SystemInformation.cxx SystemInformation.hxx.in SystemTools.cxx
kwsysPlatformTests.cmake kwsysPlatformTestsC.c
kwsysPlatformTestsCXX.cxx
Log Message:
CMake 2.8.1-rc1
Index: ProcessWin32.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/ProcessWin32.c,v
retrieving revision 1.70.4.1
retrieving revision 1.70.4.2
diff -C 2 -d -r1.70.4.1 -r1.70.4.2
*** ProcessWin32.c 1 Oct 2009 21:21:19 -0000 1.70.4.1
--- ProcessWin32.c 28 Jan 2010 21:48:02 -0000 1.70.4.2
***************
*** 2517,2520 ****
--- 2517,2525 ----
/* Toolhelp32 API definitions. */
#define TH32CS_SNAPPROCESS 0x00000002
+ #if defined(_WIN64)
+ typedef unsigned __int64 ProcessULONG_PTR;
+ #else
+ typedef unsigned long ProcessULONG_PTR;
+ #endif
typedef struct tagPROCESSENTRY32 PROCESSENTRY32;
typedef PROCESSENTRY32* LPPROCESSENTRY32;
***************
*** 2524,2528 ****
DWORD cntUsage;
DWORD th32ProcessID;
! DWORD th32DefaultHeapID;
DWORD th32ModuleID;
DWORD cntThreads;
--- 2529,2533 ----
DWORD cntUsage;
DWORD th32ProcessID;
! ProcessULONG_PTR th32DefaultHeapID;
DWORD th32ModuleID;
DWORD cntThreads;
Index: kwsysPlatformTests.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/kwsysPlatformTests.cmake,v
retrieving revision 1.2.76.1
retrieving revision 1.2.76.2
diff -C 2 -d -r1.2.76.1 -r1.2.76.2
*** kwsysPlatformTests.cmake 1 Oct 2009 21:21:20 -0000 1.2.76.1
--- kwsysPlatformTests.cmake 28 Jan 2010 21:48:03 -0000 1.2.76.2
***************
*** 163,164 ****
--- 163,216 ----
SET(KWSYS_PLATFORM_TEST_EXTRA_FLAGS)
ENDMACRO(KWSYS_PLATFORM_CXX_TEST_RUN)
+
+ #-----------------------------------------------------------------------------
+ # KWSYS_PLATFORM_INFO_TEST(lang var description)
+ #
+ # Compile test named by ${var} and store INFO strings extracted from binary.
+ MACRO(KWSYS_PLATFORM_INFO_TEST lang var description)
+ # We can implement this macro on CMake 2.6 and above.
+ IF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.6)
+ SET(${var} "")
+ ELSE()
+ # Choose a location for the result binary.
+ SET(KWSYS_PLATFORM_INFO_FILE
+ ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/${var}.bin)
+
+ # Compile the test binary.
+ IF(NOT DEFINED ${var}_COMPILED)
+ MESSAGE(STATUS "${description}")
+ TRY_COMPILE(${var}_COMPILED
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/${KWSYS_PLATFORM_TEST_FILE_${lang}}
+ COMPILE_DEFINITIONS -DTEST_${var}
+ ${KWSYS_PLATFORM_${lang}_TEST_DEFINES}
+ ${KWSYS_PLATFORM_${lang}_TEST_EXTRA_FLAGS}
+ OUTPUT_VARIABLE OUTPUT
+ COPY_FILE ${KWSYS_PLATFORM_INFO_FILE}
+ )
+ IF(${var}_COMPILED)
+ FILE(APPEND
+ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+ "${description} compiled with the following output:\n${OUTPUT}\n\n")
+ ELSE()
+ FILE(APPEND
+ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+ "${description} failed to compile with the following output:\n${OUTPUT}\n\n")
+ ENDIF()
+ IF(${var}_COMPILED)
+ MESSAGE(STATUS "${description} - compiled")
+ ELSE()
+ MESSAGE(STATUS "${description} - failed")
+ ENDIF()
+ ENDIF()
+
+ # Parse info strings out of the compiled binary.
+ IF(${var}_COMPILED)
+ FILE(STRINGS ${KWSYS_PLATFORM_INFO_FILE} ${var} REGEX "INFO:[A-Za-z0-9]+\\[[^]]*\\]")
+ ELSE()
+ SET(${var} "")
+ ENDIF()
+
+ SET(KWSYS_PLATFORM_INFO_FILE)
+ ENDIF()
+ ENDMACRO()
Index: Configure.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/Configure.h.in,v
retrieving revision 1.14.4.1
retrieving revision 1.14.4.2
diff -C 2 -d -r1.14.4.1 -r1.14.4.2
*** Configure.h.in 1 Oct 2009 21:21:16 -0000 1.14.4.1
--- Configure.h.in 28 Jan 2010 21:48:02 -0000 1.14.4.2
***************
*** 26,29 ****
--- 26,32 ----
# pragma warn -8027 /* function not inlined. */
# endif
+ # if defined(__INTEL_COMPILER)
+ # pragma warning (disable: 1572) /* floating-point equality test */
+ # endif
#endif
***************
*** 86,94 ****
/* Setup the export macro. */
! #if defined(_WIN32) && @KWSYS_BUILD_SHARED@
! # if defined(@KWSYS_NAMESPACE at _EXPORTS)
! # define @KWSYS_NAMESPACE at _EXPORT __declspec(dllexport)
# else
! # define @KWSYS_NAMESPACE at _EXPORT __declspec(dllimport)
# endif
#else
--- 89,103 ----
/* Setup the export macro. */
! #if @KWSYS_BUILD_SHARED@
! # if defined(_WIN32) || defined(__CYGWIN__)
! # if defined(@KWSYS_NAMESPACE at _EXPORTS)
! # define @KWSYS_NAMESPACE at _EXPORT __declspec(dllexport)
! # else
! # define @KWSYS_NAMESPACE at _EXPORT __declspec(dllimport)
! # endif
! # elif __GNUC__ >= 4
! # define @KWSYS_NAMESPACE at _EXPORT __attribute__ ((visibility("default")))
# else
! # define @KWSYS_NAMESPACE at _EXPORT
# endif
#else
Index: MD5.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/MD5.c,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -C 2 -d -r1.3.4.1 -r1.3.4.2
*** MD5.c 1 Oct 2009 21:21:18 -0000 1.3.4.1
--- MD5.c 28 Jan 2010 21:48:02 -0000 1.3.4.2
***************
*** 53,57 ****
*/
- /* $Id$ */
/*
Independent implementation of MD5 (RFC 1321).
--- 53,56 ----
Index: SharedForward.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SharedForward.h.in,v
retrieving revision 1.15.4.1
retrieving revision 1.15.4.2
diff -C 2 -d -r1.15.4.1 -r1.15.4.2
*** SharedForward.h.in 1 Oct 2009 21:21:19 -0000 1.15.4.1
--- SharedForward.h.in 28 Jan 2010 21:48:03 -0000 1.15.4.2
***************
*** 195,223 ****
# define KWSYS_SHARED_FORWARD_LDD_N 1
# define KWSYS_SHARED_FORWARD_LDPATH "LD_LIBRARY_PATH"
- #endif
/* FreeBSD */
! #if defined(__FreeBSD__)
# define KWSYS_SHARED_FORWARD_LDD "ldd"
# define KWSYS_SHARED_FORWARD_LDD_N 1
# define KWSYS_SHARED_FORWARD_LDPATH "LD_LIBRARY_PATH"
- #endif
/* OSX */
! #if defined(__APPLE__)
# define KWSYS_SHARED_FORWARD_LDD "otool", "-L"
# define KWSYS_SHARED_FORWARD_LDD_N 2
# define KWSYS_SHARED_FORWARD_LDPATH "DYLD_LIBRARY_PATH"
- #endif
/* AIX */
! #if defined(_AIX)
# define KWSYS_SHARED_FORWARD_LDD "dump", "-H"
# define KWSYS_SHARED_FORWARD_LDD_N 2
# define KWSYS_SHARED_FORWARD_LDPATH "LIBPATH"
- #endif
/* SUN */
! #if defined(__sparc) && !defined(__linux)
# define KWSYS_SHARED_FORWARD_LDD "ldd"
# define KWSYS_SHARED_FORWARD_LDD_N 1
--- 195,219 ----
# define KWSYS_SHARED_FORWARD_LDD_N 1
# define KWSYS_SHARED_FORWARD_LDPATH "LD_LIBRARY_PATH"
/* FreeBSD */
! #elif defined(__FreeBSD__)
# define KWSYS_SHARED_FORWARD_LDD "ldd"
# define KWSYS_SHARED_FORWARD_LDD_N 1
# define KWSYS_SHARED_FORWARD_LDPATH "LD_LIBRARY_PATH"
/* OSX */
! #elif defined(__APPLE__)
# define KWSYS_SHARED_FORWARD_LDD "otool", "-L"
# define KWSYS_SHARED_FORWARD_LDD_N 2
# define KWSYS_SHARED_FORWARD_LDPATH "DYLD_LIBRARY_PATH"
/* AIX */
! #elif defined(_AIX)
# define KWSYS_SHARED_FORWARD_LDD "dump", "-H"
# define KWSYS_SHARED_FORWARD_LDD_N 2
# define KWSYS_SHARED_FORWARD_LDPATH "LIBPATH"
/* SUN */
! #elif defined(__sun)
# define KWSYS_SHARED_FORWARD_LDD "ldd"
# define KWSYS_SHARED_FORWARD_LDD_N 1
***************
*** 228,235 ****
# define KWSYS_SHARED_FORWARD_LDPATH "LD_LIBRARY_PATH_64"
# endif
- #endif
/* HP-UX */
! #if defined(__hpux)
# define KWSYS_SHARED_FORWARD_LDD "chatr"
# define KWSYS_SHARED_FORWARD_LDD_N 1
--- 224,230 ----
# define KWSYS_SHARED_FORWARD_LDPATH "LD_LIBRARY_PATH_64"
# endif
/* HP-UX */
! #elif defined(__hpux)
# define KWSYS_SHARED_FORWARD_LDD "chatr"
# define KWSYS_SHARED_FORWARD_LDD_N 1
***************
*** 239,246 ****
# define KWSYS_SHARED_FORWARD_LDPATH "SHLIB_PATH"
# endif
- #endif
/* SGI MIPS */
! #if defined(__sgi) && defined(_MIPS_SIM)
# define KWSYS_SHARED_FORWARD_LDD "ldd"
# define KWSYS_SHARED_FORWARD_LDD_N 1
--- 234,240 ----
# define KWSYS_SHARED_FORWARD_LDPATH "SHLIB_PATH"
# endif
/* SGI MIPS */
! #elif defined(__sgi) && defined(_MIPS_SIM)
# define KWSYS_SHARED_FORWARD_LDD "ldd"
# define KWSYS_SHARED_FORWARD_LDD_N 1
***************
*** 252,268 ****
# define KWSYS_SHARED_FORWARD_LDPATH "LD_LIBRARY64_PATH"
# endif
! #endif
/* Windows */
! #if defined(_WIN32)
! # if defined(__CYGWIN__)
! # define KWSYS_SHARED_FORWARD_LDD "cygcheck"
! # define KWSYS_SHARED_FORWARD_LDD_N 1
! # endif
# define KWSYS_SHARED_FORWARD_LDPATH "PATH"
- #endif
/* Guess on this unknown system. */
! #if !defined(KWSYS_SHARED_FORWARD_LDPATH)
# define KWSYS_SHARED_FORWARD_LDD "ldd"
# define KWSYS_SHARED_FORWARD_LDD_N 1
--- 246,262 ----
# define KWSYS_SHARED_FORWARD_LDPATH "LD_LIBRARY64_PATH"
# endif
!
! /* Cygwin */
! #elif defined(__CYGWIN__)
! # define KWSYS_SHARED_FORWARD_LDD "cygcheck" /* TODO: cygwin 1.7 has ldd */
! # define KWSYS_SHARED_FORWARD_LDD_N 1
! # define KWSYS_SHARED_FORWARD_LDPATH "PATH"
/* Windows */
! #elif defined(_WIN32)
# define KWSYS_SHARED_FORWARD_LDPATH "PATH"
/* Guess on this unknown system. */
! #else
# define KWSYS_SHARED_FORWARD_LDD "ldd"
# define KWSYS_SHARED_FORWARD_LDD_N 1
Index: kwsysPlatformTestsC.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/kwsysPlatformTestsC.c,v
retrieving revision 1.2.76.1
retrieving revision 1.2.76.2
diff -C 2 -d -r1.2.76.1 -r1.2.76.2
*** kwsysPlatformTestsC.c 1 Oct 2009 21:21:20 -0000 1.2.76.1
--- kwsysPlatformTestsC.c 28 Jan 2010 21:48:03 -0000 1.2.76.2
***************
*** 61,62 ****
--- 61,100 ----
}
#endif
+
+ /*--------------------------------------------------------------------------*/
+ #ifdef TEST_KWSYS_C_TYPE_MACROS
+ char* info_macros =
+ #if defined(__SIZEOF_SHORT__)
+ "INFO:macro[__SIZEOF_SHORT__]\n"
+ #endif
+ #if defined(__SIZEOF_INT__)
+ "INFO:macro[__SIZEOF_INT__]\n"
+ #endif
+ #if defined(__SIZEOF_LONG__)
+ "INFO:macro[__SIZEOF_LONG__]\n"
+ #endif
+ #if defined(__SIZEOF_LONG_LONG__)
+ "INFO:macro[__SIZEOF_LONG_LONG__]\n"
+ #endif
+ #if defined(__SHORT_MAX__)
+ "INFO:macro[__SHORT_MAX__]\n"
+ #endif
+ #if defined(__INT_MAX__)
+ "INFO:macro[__INT_MAX__]\n"
+ #endif
+ #if defined(__LONG_MAX__)
+ "INFO:macro[__LONG_MAX__]\n"
+ #endif
+ #if defined(__LONG_LONG_MAX__)
+ "INFO:macro[__LONG_LONG_MAX__]\n"
+ #endif
+ "";
+
+ int KWSYS_PLATFORM_TEST_C_MAIN_ARGS(argc, argv)
+ {
+ int require = 0;
+ require += info_macros[argc];
+ (void)argv;
+ return require;
+ }
+ #endif
Index: String.hxx.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/String.hxx.in,v
retrieving revision 1.3.28.1
retrieving revision 1.3.28.2
diff -C 2 -d -r1.3.28.1 -r1.3.28.2
*** String.hxx.in 1 Oct 2009 21:21:19 -0000 1.3.28.1
--- String.hxx.in 28 Jan 2010 21:48:03 -0000 1.3.28.2
***************
*** 26,30 ****
* name is shorter in debugging symbols and error messages.
*/
! class @KWSYS_NAMESPACE at _EXPORT String: public @KWSYS_NAMESPACE at _stl::string
{
/** The original string type. */
--- 26,30 ----
* name is shorter in debugging symbols and error messages.
*/
! class String: public @KWSYS_NAMESPACE at _stl::string
{
/** The original string type. */
Index: kwsysPlatformTestsCXX.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/kwsysPlatformTestsCXX.cxx,v
retrieving revision 1.5.4.1
retrieving revision 1.5.4.2
diff -C 2 -d -r1.5.4.1 -r1.5.4.2
*** kwsysPlatformTestsCXX.cxx 1 Oct 2009 21:21:20 -0000 1.5.4.1
--- kwsysPlatformTestsCXX.cxx 28 Jan 2010 21:48:03 -0000 1.5.4.2
***************
*** 114,117 ****
--- 114,126 ----
#endif
+ #ifdef TEST_KWSYS_CXX_HAS_LONG_LONG
+ long long f(long long n) { return n; }
+ int main()
+ {
+ long long n = 0;
+ return static_cast<int>(f(n));
+ }
+ #endif
+
#ifdef TEST_KWSYS_CXX_HAS_NULL_TEMPLATE_ARGS
template <class T> class A;
Index: SystemInformation.hxx.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemInformation.hxx.in,v
retrieving revision 1.9.8.1
retrieving revision 1.9.8.2
diff -C 2 -d -r1.9.8.1 -r1.9.8.2
*** SystemInformation.hxx.in 1 Oct 2009 21:21:19 -0000 1.9.8.1
--- SystemInformation.hxx.in 28 Jan 2010 21:48:03 -0000 1.9.8.2
***************
*** 20,23 ****
--- 20,24 ----
#endif
#include <@KWSYS_NAMESPACE@/stl/string>
+ #include <stddef.h> /* size_t */
namespace @KWSYS_NAMESPACE@
***************
*** 64,71 ****
// Retrieve memory information in megabyte.
! unsigned long GetTotalVirtualMemory();
! unsigned long GetAvailableVirtualMemory();
! unsigned long GetTotalPhysicalMemory();
! unsigned long GetAvailablePhysicalMemory();
/** Run the different checks */
--- 65,72 ----
// Retrieve memory information in megabyte.
! size_t GetTotalVirtualMemory();
! size_t GetAvailableVirtualMemory();
! size_t GetTotalPhysicalMemory();
! size_t GetAvailablePhysicalMemory();
/** Run the different checks */
Index: ProcessUNIX.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/ProcessUNIX.c,v
retrieving revision 1.87.4.2
retrieving revision 1.87.4.3
diff -C 2 -d -r1.87.4.2 -r1.87.4.3
*** ProcessUNIX.c 28 Oct 2009 16:15:42 -0000 1.87.4.2
--- ProcessUNIX.c 28 Jan 2010 21:48:02 -0000 1.87.4.3
***************
*** 1876,1882 ****
kwsysProcessCleanupDescriptor(p);
! /* Open a file for the pipe to write (permissions 644). */
! if((fout = open(name, O_WRONLY | O_CREAT | O_TRUNC,
! S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) < 0)
{
return 0;
--- 1876,1881 ----
kwsysProcessCleanupDescriptor(p);
! /* Open a file for the pipe to write. */
! if((fout = open(name, O_WRONLY | O_CREAT | O_TRUNC, 0666)) < 0)
{
return 0;
***************
*** 2378,2384 ****
# define KWSYSPE_PS_COMMAND "ps axo pid,ppid"
# define KWSYSPE_PS_FORMAT "%d %d\n"
! #elif defined(__hpux) || defined(__sparc) || defined(__sgi) || defined(_AIX)
# define KWSYSPE_PS_COMMAND "ps -ef"
# define KWSYSPE_PS_FORMAT "%*s %d %d %*[^\n]\n"
#elif defined(__CYGWIN__)
# define KWSYSPE_PS_COMMAND "ps aux"
--- 2377,2387 ----
# define KWSYSPE_PS_COMMAND "ps axo pid,ppid"
# define KWSYSPE_PS_FORMAT "%d %d\n"
! #elif defined(__hpux) || defined(__sun__) || defined(__sgi) || defined(_AIX) \
! || defined(__sparc)
# define KWSYSPE_PS_COMMAND "ps -ef"
# define KWSYSPE_PS_FORMAT "%*s %d %d %*[^\n]\n"
+ #elif defined(__QNX__)
+ # define KWSYSPE_PS_COMMAND "ps -Af"
+ # define KWSYSPE_PS_FORMAT "%*d %d %d %*[^\n]\n"
#elif defined(__CYGWIN__)
# define KWSYSPE_PS_COMMAND "ps aux"
***************
*** 2393,2403 ****
#endif
! /* Kill the process now to make sure it does not create more
! children. Do not reap it yet so we can identify its existing
! children. There is a small race condition here. If the child
! forks after we begin looking for children below but before it
! receives this kill signal we might miss a child. Also we might
! not be able to catch up to a fork bomb. */
! kill(process_id, SIGKILL);
/* Kill all children if we can find them. */
--- 2396,2401 ----
#endif
! /* Suspend the process to be sure it will not create more children. */
! kill(process_id, SIGSTOP);
/* Kill all children if we can find them. */
***************
*** 2487,2490 ****
--- 2485,2501 ----
#endif
}
+
+ /* Kill the process. */
+ kill(process_id, SIGKILL);
+
+ #if defined(__APPLE__)
+ /* On OS X 10.3 the above SIGSTOP occasionally prevents the SIGKILL
+ from working. Just in case, we resume the child and kill it
+ again. There is a small race condition in this obscure case. If
+ the child manages to fork again between these two signals, we
+ will not catch its children. */
+ kill(process_id, SIGCONT);
+ kill(process_id, SIGKILL);
+ #endif
}
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/CMakeLists.txt,v
retrieving revision 1.148.2.1
retrieving revision 1.148.2.2
diff -C 2 -d -r1.148.2.1 -r1.148.2.2
*** CMakeLists.txt 1 Oct 2009 21:21:16 -0000 1.148.2.1
--- CMakeLists.txt 28 Jan 2010 21:48:02 -0000 1.148.2.2
***************
*** 104,107 ****
--- 104,115 ----
# written.
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5 FATAL_ERROR)
+ IF(COMMAND CMAKE_POLICY)
+ CMAKE_POLICY(SET CMP0003 NEW)
+ ENDIF(COMMAND CMAKE_POLICY)
+
+ # Allow empty endif() and such with CMake 2.4.
+ SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS 1)
+
#-----------------------------------------------------------------------------
# If a namespace is not specified, use "kwsys" and enable testing.
***************
*** 112,121 ****
SET(KWSYS_STANDALONE 1)
ENDIF(NOT KWSYS_NAMESPACE)
- IF(KWSYS_STANDALONE)
- CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
- IF(COMMAND CMAKE_POLICY)
- CMAKE_POLICY(SET CMP0003 NEW)
- ENDIF(COMMAND CMAKE_POLICY)
- ENDIF(KWSYS_STANDALONE)
#-----------------------------------------------------------------------------
--- 120,123 ----
***************
*** 300,310 ****
ENDIF(COMMAND INSTALL)
- # Work-around for CMake 1.6.7 bug in custom command dependencies when
- # there is no executable output path.
- IF(NOT EXECUTABLE_OUTPUT_PATH)
- SET(EXECUTABLE_OUTPUT_PATH "${PROJECT_BINARY_DIR}" CACHE PATH
- "Output directory for executables.")
- ENDIF(NOT EXECUTABLE_OUTPUT_PATH)
-
# Generated source files will need this header.
STRING(COMPARE EQUAL "${PROJECT_SOURCE_DIR}" "${PROJECT_BINARY_DIR}"
--- 302,305 ----
***************
*** 475,491 ****
IF(KWSYS_USE_FundamentalType)
! # Determine type sizes.
! CHECK_TYPE_SIZE("char" KWSYS_SIZEOF_CHAR)
! CHECK_TYPE_SIZE("short" KWSYS_SIZEOF_SHORT)
! CHECK_TYPE_SIZE("int" KWSYS_SIZEOF_INT)
! CHECK_TYPE_SIZE("long" KWSYS_SIZEOF_LONG)
! CHECK_TYPE_SIZE("long long" KWSYS_SIZEOF_LONG_LONG)
! CHECK_TYPE_SIZE("__int64" KWSYS_SIZEOF___INT64)
! IF(NOT KWSYS_SIZEOF_LONG_LONG)
! SET(KWSYS_SIZEOF_LONG_LONG 0)
! ENDIF(NOT KWSYS_SIZEOF_LONG_LONG)
! IF(NOT KWSYS_SIZEOF___INT64)
! SET(KWSYS_SIZEOF___INT64 0)
! ENDIF(NOT KWSYS_SIZEOF___INT64)
# Check uniqueness of types.
--- 470,521 ----
IF(KWSYS_USE_FundamentalType)
! # Look for type size helper macros.
! KWSYS_PLATFORM_INFO_TEST(C KWSYS_C_TYPE_MACROS
! "Checking for C type size macros")
! SET(macro_regex ".*INFO:macro\\[([^]]*)\\].*")
! FOREACH(info ${KWSYS_C_TYPE_MACROS})
! IF("${info}" MATCHES "${macro_regex}")
! STRING(REGEX REPLACE "${macro_regex}" "\\1" macro "${info}")
! SET(KWSYS_C_HAS_MACRO_${macro} 1)
! ENDIF()
! ENDFOREACH()
!
! # Determine type sizes at preprocessing time if possible, and
! # otherwise fall back to a try-compile.
! SET(KWSYS_C_TYPE_NAME_CHAR "char")
! SET(KWSYS_C_TYPE_NAME_SHORT "short")
! SET(KWSYS_C_TYPE_NAME_INT "int")
! SET(KWSYS_C_TYPE_NAME_LONG "long")
! SET(KWSYS_C_TYPE_NAME_LONG_LONG "long long")
! SET(KWSYS_C_TYPE_NAME___INT64 "__int64")
! FOREACH(type CHAR SHORT INT LONG LONG_LONG __INT64)
! IF(KWSYS_C_HAS_MACRO___SIZEOF_${type}__)
! # Use __SIZEOF_${type}__ macro.
! SET(KWSYS_SIZEOF_${type} TRUE)
! SET(KWSYS_C_CODE_SIZEOF_${type} "#define ${KWSYS_NAMESPACE}_SIZEOF_${type} __SIZEOF_${type}__")
! ELSEIF(KWSYS_C_HAS_MACRO___${type}_MAX__)
! # Use __${type}_MAX__ macro.
! SET(KWSYS_SIZEOF_${type} TRUE)
! SET(KWSYS_C_CODE_SIZEOF_${type} "#if __${type}_MAX__ == 0x7f
! # define ${KWSYS_NAMESPACE}_SIZEOF_${type} 1
! #elif __${type}_MAX__ == 0x7fff
! # define ${KWSYS_NAMESPACE}_SIZEOF_${type} 2
! #elif __${type}_MAX__ == 0x7fffffff
! # define ${KWSYS_NAMESPACE}_SIZEOF_${type} 4
! #elif __${type}_MAX__>>32 == 0x7fffffff
! # define ${KWSYS_NAMESPACE}_SIZEOF_${type} 8
! #else
! # error \"Cannot determine sizeof(${KWSYS_C_TYPE_NAME_${type}}).\"
! #endif")
! ELSE()
! # Configure a hard-coded type size.
! CHECK_TYPE_SIZE("${KWSYS_C_TYPE_NAME_${type}}" KWSYS_SIZEOF_${type})
! IF(NOT KWSYS_SIZEOF_${type})
! SET(KWSYS_SIZEOF_${type} 0)
! ENDIF()
! SET(KWSYS_C_CODE_SIZEOF_${type}
! "#define ${KWSYS_NAMESPACE}_SIZEOF_${type} ${KWSYS_SIZEOF_${type}}")
! ENDIF()
! ENDFOREACH()
# Check uniqueness of types.
***************
*** 531,536 ****
IF(KWSYS_USE_IOStream)
# Determine whether iostreams support long long.
! CHECK_TYPE_SIZE("long long" KWSYS_SIZEOF_LONG_LONG)
! IF(KWSYS_SIZEOF_LONG_LONG)
SET(KWSYS_PLATFORM_CXX_TEST_DEFINES
-DKWSYS_IOS_USE_ANSI=${KWSYS_IOS_USE_ANSI}
--- 561,567 ----
IF(KWSYS_USE_IOStream)
# Determine whether iostreams support long long.
! KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_HAS_LONG_LONG
! "Checking whether C++ compiler has 'long long'" DIRECT)
! IF(KWSYS_CXX_HAS_LONG_LONG)
SET(KWSYS_PLATFORM_CXX_TEST_DEFINES
-DKWSYS_IOS_USE_ANSI=${KWSYS_IOS_USE_ANSI}
***************
*** 541,548 ****
"Checking if ostream supports long long" DIRECT)
SET(KWSYS_PLATFORM_CXX_TEST_DEFINES)
! ELSE(KWSYS_SIZEOF_LONG_LONG)
SET(KWSYS_IOS_HAS_ISTREAM_LONG_LONG 0)
SET(KWSYS_IOS_HAS_OSTREAM_LONG_LONG 0)
! ENDIF(KWSYS_SIZEOF_LONG_LONG)
ENDIF(KWSYS_USE_IOStream)
--- 572,579 ----
"Checking if ostream supports long long" DIRECT)
SET(KWSYS_PLATFORM_CXX_TEST_DEFINES)
! ELSE()
SET(KWSYS_IOS_HAS_ISTREAM_LONG_LONG 0)
SET(KWSYS_IOS_HAS_OSTREAM_LONG_LONG 0)
! ENDIF()
ENDIF(KWSYS_USE_IOStream)
***************
*** 990,993 ****
--- 1021,1025 ----
ADD_LIBRARY(${KWSYS_NAMESPACE}TestDynload MODULE testDynload.c)
KWSYS_SET_PROPERTY(TARGET ${KWSYS_NAMESPACE}TestDynload PROPERTY LABELS ${KWSYS_LABELS_LIB})
+ ADD_DEPENDENCIES(${KWSYS_NAMESPACE}TestDynload ${KWSYS_NAMESPACE})
ENDIF(KWSYS_USE_DynamicLoader)
CREATE_TEST_SOURCELIST(
***************
*** 1058,1061 ****
--- 1090,1098 ----
ENDFOREACH(n)
+ # Some Apple compilers produce bad optimizations in this source.
+ IF(APPLE AND "${CMAKE_C_COMPILER_ID}" MATCHES "^(GNU|LLVM)$")
+ SET_SOURCE_FILES_PROPERTIES(testProcess.c PROPERTIES COMPILE_FLAGS -O0)
+ ENDIF()
+
# Test SharedForward
CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/testSharedForward.c.in
***************
*** 1064,1067 ****
--- 1101,1105 ----
${PROJECT_BINARY_DIR}/testSharedForward.c)
KWSYS_SET_PROPERTY(TARGET ${KWSYS_NAMESPACE}TestSharedForward PROPERTY LABELS ${KWSYS_LABELS_EXE})
+ ADD_DEPENDENCIES(${KWSYS_NAMESPACE}TestSharedForward ${KWSYS_NAMESPACE}_c)
ADD_TEST(kwsys.testSharedForward ${EXEC_DIR}/${KWSYS_NAMESPACE}TestSharedForward 1)
KWSYS_SET_PROPERTY(TEST kwsys.testSharedForward PROPERTY LABELS ${KWSYS_LABELS_TEST})
Index: FundamentalType.h.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/FundamentalType.h.in,v
retrieving revision 1.2.8.1
retrieving revision 1.2.8.2
diff -C 2 -d -r1.2.8.1 -r1.2.8.2
*** FundamentalType.h.in 1 Oct 2009 21:21:18 -0000 1.2.8.1
--- FundamentalType.h.in 28 Jan 2010 21:48:02 -0000 1.2.8.2
***************
*** 37,46 ****
/* The size of fundamental types. Types that do not exist have size 0. */
! #define @KWSYS_NAMESPACE at _SIZEOF_CHAR @KWSYS_SIZEOF_CHAR@
! #define @KWSYS_NAMESPACE at _SIZEOF_SHORT @KWSYS_SIZEOF_SHORT@
! #define @KWSYS_NAMESPACE at _SIZEOF_INT @KWSYS_SIZEOF_INT@
! #define @KWSYS_NAMESPACE at _SIZEOF_LONG @KWSYS_SIZEOF_LONG@
! #define @KWSYS_NAMESPACE at _SIZEOF_LONG_LONG @KWSYS_SIZEOF_LONG_LONG@
! #define @KWSYS_NAMESPACE at _SIZEOF___INT64 @KWSYS_SIZEOF___INT64@
/* Whether types "long long" and "__int64" are enabled. If a type is
--- 37,46 ----
/* The size of fundamental types. Types that do not exist have size 0. */
! @KWSYS_C_CODE_SIZEOF_CHAR@
! @KWSYS_C_CODE_SIZEOF_SHORT@
! @KWSYS_C_CODE_SIZEOF_INT@
! @KWSYS_C_CODE_SIZEOF_LONG@
! @KWSYS_C_CODE_SIZEOF_LONG_LONG@
! @KWSYS_C_CODE_SIZEOF___INT64@
/* Whether types "long long" and "__int64" are enabled. If a type is
Index: SystemInformation.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemInformation.cxx,v
retrieving revision 1.45.6.2
retrieving revision 1.45.6.3
diff -C 2 -d -r1.45.6.2 -r1.45.6.3
*** SystemInformation.cxx 9 Oct 2009 20:11:41 -0000 1.45.6.2
--- SystemInformation.cxx 28 Jan 2010 21:48:03 -0000 1.45.6.3
***************
*** 14,17 ****
--- 14,29 ----
#endif
+ // TODO:
+ // We need an alternative implementation for many functions in this file
+ // when USE_ASM_INSTRUCTIONS gets defined as 0.
+ //
+ // Consider using these on Win32/Win64 for some of them:
+ //
+ // IsProcessorFeaturePresent
[...1342 lines suppressed...]
}
+
void SystemInformationImplementation::TrimNewline(kwsys_stl::string& output)
{
***************
*** 3436,3439 ****
--- 3580,3584 ----
}
+
/** Return true if the machine is 64 bits */
bool SystemInformationImplementation::Is64Bits()
***************
*** 3442,3444 ****
--- 3587,3590 ----
}
+
} // namespace @KWSYS_NAMESPACE@
Index: SystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemTools.cxx,v
retrieving revision 1.252.2.2
retrieving revision 1.252.2.3
diff -C 2 -d -r1.252.2.2 -r1.252.2.3
*** SystemTools.cxx 28 Oct 2009 16:15:42 -0000 1.252.2.2
--- SystemTools.cxx 28 Jan 2010 21:48:03 -0000 1.252.2.3
***************
*** 288,292 ****
# define TIMEB _timeb
# endif
! #elif defined( __CYGWIN__ ) || defined( __linux__ )
# include <sys/time.h>
# include <time.h>
--- 288,292 ----
# define TIMEB _timeb
# endif
! #elif defined( __CYGWIN__ ) || defined( __linux__ ) || defined(__APPLE__)
# include <sys/time.h>
# include <time.h>
More information about the Cmake-commits
mailing list