diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 117 |
1 files changed, 1 insertions, 116 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d8f7e57..b0a8542 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -146,7 +146,6 @@ if(KWSYS_STANDALONE OR CMake_SOURCE_DIR) set(KWSYS_USE_SystemTools 1) set(KWSYS_USE_CommandLineArguments 1) set(KWSYS_USE_Terminal 1) - set(KWSYS_USE_IOStream 1) set(KWSYS_USE_FStream 1) set(KWSYS_USE_String 1) set(KWSYS_USE_SystemInformation 1) @@ -360,67 +359,12 @@ endif() # capabilities and parent project's request. Enforce 0/1 as only # possible values for configuration into Configure.hxx. -# Check existence and uniqueness of long long and __int64. -KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_HAS_LONG_LONG - "Checking whether C++ compiler has 'long long'" DIRECT) -KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_HAS___INT64 - "Checking whether C++ compiler has '__int64'" DIRECT) -if(KWSYS_CXX_HAS___INT64) - KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_SAME_LONG_AND___INT64 - "Checking whether long and __int64 are the same type" DIRECT) - if(KWSYS_CXX_HAS_LONG_LONG) - KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_SAME_LONG_LONG_AND___INT64 - "Checking whether long long and __int64 are the same type" DIRECT) - endif() -endif() - -# Enable the "long long" type if it is available. It is standard in -# C99 and C++03 but not in earlier standards. -if(KWSYS_CXX_HAS_LONG_LONG) - set(KWSYS_USE_LONG_LONG 1) -else() - set(KWSYS_USE_LONG_LONG 0) -endif() - -# Enable the "__int64" type if it is available and unique. It is not -# standard. -set(KWSYS_USE___INT64 0) -if(KWSYS_CXX_HAS___INT64) - if(NOT KWSYS_CXX_SAME_LONG_AND___INT64) - if(NOT KWSYS_CXX_SAME_LONG_LONG_AND___INT64) - set(KWSYS_USE___INT64 1) - endif() - endif() -endif() - if(KWSYS_USE_Encoding) # Look for type size helper macros. KWSYS_PLATFORM_CXX_TEST(KWSYS_STL_HAS_WSTRING "Checking whether wstring is available" DIRECT) endif() -if(KWSYS_USE_IOStream) - # Determine whether iostreams support long long. - if(KWSYS_CXX_HAS_LONG_LONG) - KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_HAS_ISTREAM_LONG_LONG - "Checking if istream supports long long" DIRECT) - KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_HAS_OSTREAM_LONG_LONG - "Checking if ostream supports long long" DIRECT) - else() - set(KWSYS_IOS_HAS_ISTREAM_LONG_LONG 0) - set(KWSYS_IOS_HAS_OSTREAM_LONG_LONG 0) - endif() - if(KWSYS_CXX_HAS___INT64) - KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_HAS_ISTREAM___INT64 - "Checking if istream supports __int64" DIRECT) - KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_HAS_OSTREAM___INT64 - "Checking if ostream supports __int64" DIRECT) - else() - set(KWSYS_IOS_HAS_ISTREAM___INT64 0) - set(KWSYS_IOS_HAS_OSTREAM___INT64 0) - endif() -endif() - if(KWSYS_NAMESPACE MATCHES "^kwsys$") set(KWSYS_NAME_IS_KWSYS 1) else() @@ -569,24 +513,6 @@ if(KWSYS_USE_SystemInformation) set_property(SOURCE SystemInformation.cxx APPEND PROPERTY COMPILE_DEFINITIONS KWSYS_CXX_HAS_RLIMIT64=1) endif() - KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_HAS_ATOL - "Checking whether CXX compiler has atol" DIRECT) - if(KWSYS_CXX_HAS_ATOL) - set_property(SOURCE SystemInformation.cxx APPEND PROPERTY - COMPILE_DEFINITIONS KWSYS_CXX_HAS_ATOL=1) - endif() - KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_HAS_ATOLL - "Checking whether CXX compiler has atoll" DIRECT) - if(KWSYS_CXX_HAS_ATOLL) - set_property(SOURCE SystemInformation.cxx APPEND PROPERTY - COMPILE_DEFINITIONS KWSYS_CXX_HAS_ATOLL=1) - endif() - KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_HAS__ATOI64 - "Checking whether CXX compiler has _atoi64" DIRECT) - if(KWSYS_CXX_HAS__ATOI64) - set_property(SOURCE SystemInformation.cxx APPEND PROPERTY - COMPILE_DEFINITIONS KWSYS_CXX_HAS__ATOI64=1) - endif() if(UNIX) include(CheckIncludeFileCXX) # check for simple stack trace @@ -650,36 +576,6 @@ if(KWSYS_USE_SystemInformation) endif() endif() endif() - if(BORLAND) - KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_HAS_BORLAND_ASM - "Checking whether Borland CXX compiler supports assembler instructions" DIRECT) - if(KWSYS_CXX_HAS_BORLAND_ASM) - set_property(SOURCE SystemInformation.cxx APPEND PROPERTY - COMPILE_DEFINITIONS KWSYS_CXX_HAS_BORLAND_ASM=1) - KWSYS_PLATFORM_CXX_TEST(KWSYS_CXX_HAS_BORLAND_ASM_CPUID - "Checking whether Borland CXX compiler supports CPUID assembler instruction" DIRECT) - if(KWSYS_CXX_HAS_BORLAND_ASM_CPUID) - set_property(SOURCE SystemInformation.cxx APPEND PROPERTY - COMPILE_DEFINITIONS KWSYS_CXX_HAS_BORLAND_ASM_CPUID=1) - endif() - endif() - endif() - if(KWSYS_USE___INT64) - set_property(SOURCE SystemInformation.cxx testSystemInformation.cxx APPEND PROPERTY - COMPILE_DEFINITIONS KWSYS_USE___INT64=1) - endif() - if(KWSYS_USE_LONG_LONG) - set_property(SOURCE SystemInformation.cxx testSystemInformation.cxx APPEND PROPERTY - COMPILE_DEFINITIONS KWSYS_USE_LONG_LONG=1) - endif() - if(KWSYS_IOS_HAS_OSTREAM_LONG_LONG) - set_property(SOURCE SystemInformation.cxx testSystemInformation.cxx APPEND PROPERTY - COMPILE_DEFINITIONS KWSYS_IOS_HAS_OSTREAM_LONG_LONG=1) - endif() - if(KWSYS_IOS_HAS_OSTREAM___INT64) - set_property(SOURCE SystemInformation.cxx testSystemInformation.cxx APPEND PROPERTY - COMPILE_DEFINITIONS KWSYS_IOS_HAS_OSTREAM___INT64=1) - endif() if(KWSYS_BUILD_SHARED) set_property(SOURCE SystemInformation.cxx APPEND PROPERTY COMPILE_DEFINITIONS KWSYS_BUILD_SHARED=1) @@ -731,16 +627,10 @@ set(KWSYS_CLASSES) set(KWSYS_H_FILES Configure SharedForward) set(KWSYS_HXX_FILES Configure String) -if(NOT CMake_SOURCE_DIR) - set(KWSYS_HXX_FILES ${KWSYS_HXX_FILES} - hashtable hash_fun hash_map hash_set - ) -endif() - # Add selected C++ classes. set(cppclasses Directory DynamicLoader Encoding Glob RegularExpression SystemTools - CommandLineArguments IOStream FStream SystemInformation ConsoleBuf + CommandLineArguments FStream SystemInformation ConsoleBuf ) foreach(cpp ${cppclasses}) if(KWSYS_USE_${cpp}) @@ -1071,11 +961,6 @@ if(KWSYS_STANDALONE OR CMake_SOURCE_DIR) endforeach() # C++ tests - if(NOT WATCOM AND NOT CMake_SOURCE_DIR) - set(KWSYS_CXX_TESTS - testHashSTL.cxx - ) - endif() set(KWSYS_CXX_TESTS ${KWSYS_CXX_TESTS} testConfigure.cxx testSystemTools.cxx |