Merge branch 'upstream-kwsys' into import-KWSys-subtree
This commit is contained in:
Brad King
commit
4b8d3639ad
|
|
@ -566,9 +566,28 @@ IF(KWSYS_USE_SystemTools)
|
|||
ENDIF()
|
||||
|
||||
IF(KWSYS_USE_SystemInformation)
|
||||
SET_PROPERTY(SOURCE SystemInformation.cxx PROPERTY
|
||||
COMPILE_DEFINITIONS KWSYS_USE_LONG_LONG=${KWSYS_USE_LONG_LONG}
|
||||
KWSYS_USE___INT64=${KWSYS_USE___INT64})
|
||||
IF(NOT CYGWIN)
|
||||
INCLUDE(CheckIncludeFiles)
|
||||
CHECK_INCLUDE_FILES("sys/types.h;ifaddrs.h" KWSYS_SYS_HAS_IFADDRS_H)
|
||||
IF(KWSYS_SYS_HAS_IFADDRS_H)
|
||||
SET_PROPERTY(SOURCE SystemInformation.cxx APPEND PROPERTY
|
||||
COMPILE_DEFINITIONS KWSYS_SYS_HAS_IFADDRS_H=1)
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
IF(WIN32)
|
||||
INCLUDE(CheckSymbolExists)
|
||||
SET(CMAKE_REQUIRED_LIBRARIES Psapi)
|
||||
CHECK_SYMBOL_EXISTS(GetProcessMemoryInfo "windows.h;psapi.h" KWSYS_SYS_HAS_PSAPI)
|
||||
UNSET(CMAKE_REQUIRED_LIBRARIES)
|
||||
IF(KWSYS_SYS_HAS_PSAPI)
|
||||
SET_PROPERTY(SOURCE SystemInformation.cxx APPEND PROPERTY
|
||||
COMPILE_DEFINITIONS KWSYS_SYS_HAS_PSAPI=1)
|
||||
IF(MSVC70 OR MSVC71)
|
||||
# Suppress LNK4089: all references to 'PSAPI.DLL' discarded by /OPT:REF
|
||||
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /IGNORE:4089")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
|
|
@ -802,9 +821,12 @@ IF(KWSYS_C_SRCS OR KWSYS_CXX_SRCS)
|
|||
TARGET_LINK_LIBRARIES(${KWSYS_NAMESPACE} ${CMAKE_DL_LIBS})
|
||||
ENDIF(UNIX)
|
||||
ENDIF(KWSYS_USE_DynamicLoader)
|
||||
|
||||
|
||||
IF(KWSYS_USE_SystemInformation AND WIN32)
|
||||
TARGET_LINK_LIBRARIES(${KWSYS_NAMESPACE} ws2_32)
|
||||
IF(KWSYS_SYS_HAS_PSAPI)
|
||||
TARGET_LINK_LIBRARIES(${KWSYS_NAMESPACE} Psapi)
|
||||
ENDIF()
|
||||
ENDIF(KWSYS_USE_SystemInformation AND WIN32)
|
||||
|
||||
# Apply user-defined target properties to the library.
|
||||
|
|
@ -842,6 +864,16 @@ ENDIF(KWSYS_ENABLE_C AND KWSYS_C_SRCS)
|
|||
# line to configure the namespace in the C and C++ source files.
|
||||
ADD_DEFINITIONS("-DKWSYS_NAMESPACE=${KWSYS_NAMESPACE}")
|
||||
|
||||
# Disable deprecation warnings for standard C functions.
|
||||
IF(MSVC OR (WIN32 AND "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$"))
|
||||
ADD_DEFINITIONS(
|
||||
-D_CRT_NONSTDC_NO_DEPRECATE
|
||||
-D_CRT_SECURE_NO_DEPRECATE
|
||||
-D_CRT_SECURE_NO_WARNINGS
|
||||
-D_SCL_SECURE_NO_DEPRECATE
|
||||
)
|
||||
ENDIF()
|
||||
|
||||
IF(KWSYS_USE_String)
|
||||
# Activate code in "String.c". See the comment in the source.
|
||||
SET_SOURCE_FILES_PROPERTIES(String.c PROPERTIES
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#=============================================================================
|
||||
# KWSys - Kitware System Library
|
||||
# Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
|
||||
# Copyright 2000-2012 Kitware, Inc., Insight Software Consortium
|
||||
#
|
||||
# Distributed under the OSI-approved BSD License (the "License");
|
||||
# see accompanying file Copyright.txt for details.
|
||||
|
|
@ -9,10 +9,9 @@
|
|||
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
# See the License for more information.
|
||||
#=============================================================================
|
||||
set (CTEST_PROJECT_NAME "kwsys")
|
||||
set (CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
|
||||
set (CTEST_DART_SERVER_VERSION "2")
|
||||
set(CTEST_PROJECT_NAME "KWSys")
|
||||
set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
|
||||
set(CTEST_DROP_METHOD "http")
|
||||
set(CTEST_DROP_SITE "www.cdash.org")
|
||||
set(CTEST_DROP_LOCATION "/CDash/submit.php?project=PublicDashboard")
|
||||
set(CTEST_DROP_SITE "open.cdash.org")
|
||||
set(CTEST_DROP_LOCATION "/submit.php?project=KWSys")
|
||||
set(CTEST_DROP_SITE_CDASH TRUE)
|
||||
|
|
|
|||
|
|
@ -37,20 +37,6 @@
|
|||
/* Whether kwsys namespace is "kwsys". */
|
||||
#define @KWSYS_NAMESPACE@_NAME_IS_KWSYS @KWSYS_NAME_IS_KWSYS@
|
||||
|
||||
/* If we are building a kwsys .c or .cxx file, suppress the Microsoft
|
||||
deprecation warnings. */
|
||||
#if defined(KWSYS_NAMESPACE)
|
||||
# ifndef _CRT_NONSTDC_NO_DEPRECATE
|
||||
# define _CRT_NONSTDC_NO_DEPRECATE
|
||||
# endif
|
||||
# ifndef _CRT_SECURE_NO_DEPRECATE
|
||||
# define _CRT_SECURE_NO_DEPRECATE
|
||||
# endif
|
||||
# ifndef _SCL_SECURE_NO_DEPRECATE
|
||||
# define _SCL_SECURE_NO_DEPRECATE
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* Whether Large File Support is requested. */
|
||||
#define @KWSYS_NAMESPACE@_LFS_REQUESTED @KWSYS_LFS_REQUESTED@
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -25,13 +25,22 @@ namespace @KWSYS_NAMESPACE@
|
|||
{
|
||||
|
||||
|
||||
// forward declare the implementation class
|
||||
// forward declare the implementation class
|
||||
class SystemInformationImplementation;
|
||||
|
||||
class @KWSYS_NAMESPACE@_EXPORT SystemInformation
|
||||
{
|
||||
|
||||
class @KWSYS_NAMESPACE@_EXPORT SystemInformation
|
||||
{
|
||||
#if @KWSYS_USE_LONG_LONG@
|
||||
typedef long long LongLong;
|
||||
#elif @KWSYS_USE___INT64@
|
||||
typedef __int64 LongLong;
|
||||
#else
|
||||
# error "No Long Long"
|
||||
#endif
|
||||
friend class SystemInformationImplementation;
|
||||
SystemInformationImplementation* Implementation;
|
||||
public:
|
||||
|
||||
SystemInformation ();
|
||||
~SystemInformation ();
|
||||
|
||||
|
|
@ -40,6 +49,7 @@ public:
|
|||
kwsys_stl::string GetTypeID();
|
||||
kwsys_stl::string GetFamilyID();
|
||||
kwsys_stl::string GetModelID();
|
||||
kwsys_stl::string GetModelName();
|
||||
kwsys_stl::string GetSteppingCode();
|
||||
const char * GetExtendedProcessorName();
|
||||
const char * GetProcessorSerialNumber();
|
||||
|
|
@ -49,13 +59,27 @@ public:
|
|||
int GetProcessorAPICID();
|
||||
int GetProcessorCacheXSize(long int);
|
||||
bool DoesCPUSupportFeature(long int);
|
||||
|
||||
const char * GetOSName();
|
||||
|
||||
// returns an informative general description of the cpu
|
||||
// on this system.
|
||||
kwsys_stl::string GetCPUDescription();
|
||||
|
||||
const char * GetHostname();
|
||||
kwsys_stl::string GetFullyQualifiedDomainName();
|
||||
|
||||
const char * GetOSName();
|
||||
const char * GetOSRelease();
|
||||
const char * GetOSVersion();
|
||||
const char * GetOSPlatform();
|
||||
|
||||
int GetOSIsWindows();
|
||||
int GetOSIsLinux();
|
||||
int GetOSIsApple();
|
||||
|
||||
// returns an informative general description of the os
|
||||
// on this system.
|
||||
kwsys_stl::string GetOSDescription();
|
||||
|
||||
bool Is64Bits();
|
||||
|
||||
unsigned int GetNumberOfLogicalCPU(); // per physical cpu
|
||||
|
|
@ -63,19 +87,31 @@ public:
|
|||
|
||||
bool DoesCPUSupportCPUID();
|
||||
|
||||
// Retrieve id of the current running process
|
||||
LongLong GetProcessId();
|
||||
|
||||
// Retrieve memory information in megabyte.
|
||||
size_t GetTotalVirtualMemory();
|
||||
size_t GetAvailableVirtualMemory();
|
||||
size_t GetTotalPhysicalMemory();
|
||||
size_t GetAvailablePhysicalMemory();
|
||||
size_t GetAvailablePhysicalMemory();
|
||||
|
||||
// returns an informative general description if the ram
|
||||
// on this system
|
||||
kwsys_stl::string GetMemoryDescription();
|
||||
|
||||
// Retrieve physical memory information in kib
|
||||
LongLong GetMemoryTotal();
|
||||
LongLong GetMemoryUsed();
|
||||
|
||||
// enable/disable stack trace signal handler.
|
||||
static
|
||||
void SetStackTraceOnError(int enable);
|
||||
|
||||
/** Run the different checks */
|
||||
void RunCPUCheck();
|
||||
void RunOSCheck();
|
||||
void RunMemoryCheck();
|
||||
private:
|
||||
SystemInformationImplementation* Implementation;
|
||||
|
||||
};
|
||||
} // namespace @KWSYS_NAMESPACE@
|
||||
|
||||
|
|
|
|||
|
|
@ -1665,7 +1665,7 @@ kwsys_stl::string SystemTools::EscapeChars(
|
|||
kwsys_stl::string n;
|
||||
if (str)
|
||||
{
|
||||
if (!chars_to_escape | !*chars_to_escape)
|
||||
if (!chars_to_escape || !*chars_to_escape)
|
||||
{
|
||||
n.append(str);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue