diff options
| -rw-r--r-- | CMakeLists.txt | 18 | ||||
| -rw-r--r-- | cmake/modules/Check64BitFormat.c.in | 48 | ||||
| -rw-r--r-- | cmake/modules/Check64BitFormat.cmake | 90 | ||||
| -rw-r--r-- | cmakeconfig.h.in | 15 |
4 files changed, 0 insertions, 171 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 448fc43033..8b1b3c2c5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -146,24 +146,6 @@ test_big_endian(WORDS_BIGENDIAN) set(DATAFILE_DIR "${CMAKE_INSTALL_PREFIX}/share/${CPACK_PACKAGE_NAME}") -#64 Bit format -include(Check64BitFormat) - -check_64bit_format(ll FORMAT_64BIT) -check_64bit_format(L FORMAT_64BIT) -check_64bit_format(q FORMAT_64BIT) -check_64bit_format(I64 FORMAT_64BIT) - -if(NOT FORMAT_64BIT) - message(FATAL " 64 bit format missing") -endif() - -set(PRIX64 "${FORMAT_64BIT}X") -set(PRIx64 "${FORMAT_64BIT}x") -set(PRId64 "${FORMAT_64BIT}d") -set(PRIo64 "${FORMAT_64BIT}o") -set(PRIu64 "${FORMAT_64BIT}u") - #Platform specific if(UNIX) set(WS_VAR_IMPORT "extern") diff --git a/cmake/modules/Check64BitFormat.c.in b/cmake/modules/Check64BitFormat.c.in deleted file mode 100644 index 0123fd214f..0000000000 --- a/cmake/modules/Check64BitFormat.c.in +++ /dev/null @@ -1,48 +0,0 @@ -/******************************************************************* -* -* Copyright (c) 2006 Frederic Heem, <frederic.heem@telsey.it> -* All rights reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions -* are met: -* -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in -* the documentation and/or other materials provided with the -* distribution. -* -* * Neither the name of the Telsey nor the names of its -* contributors may be used to endorse or promote products derived -* from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -* POSSIBILITY OF SUCH DAMAGE. -* -*******************************************************************/ - -#include <stdio.h> -#define LENGTH 16 -int main(int ac, char*av[]){ - unsigned long long t = 1; - char strbuf[LENGTH+1] = {0}; - sprintf(strbuf, "%016@FORMAT@x", t << 32); - if (strcmp(strbuf, "0000000100000000") == 0){ - exit(0); - } else { - exit(1); - } -} diff --git a/cmake/modules/Check64BitFormat.cmake b/cmake/modules/Check64BitFormat.cmake deleted file mode 100644 index 3cad33d645..0000000000 --- a/cmake/modules/Check64BitFormat.cmake +++ /dev/null @@ -1,90 +0,0 @@ -################################################################### -# -# Copyright (c) 2006 Frederic Heem, <frederic.heem@telsey.it> -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# -# * Neither the name of the Telsey nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -################################################################### -# - Check the 64 bit formats. -# CHECK_64BIT_FORMAT(FORMAT VARIABLE) -# - macro which checks if the 64 bit format is accepted -# FORMAT - the format, e.g ll, L, q or I64 -# VARIABLE - variable to store the format if it is a valdid format -# -# Example of use in a CMakeLists.txt -# -# include(Check64BitFormat) -# -# check_64bit_format(ll FORMAT_64BIT) -# check_64bit_format(L FORMAT_64BIT) -# check_64bit_format(q FORMAT_64BIT) -# check_64bit_format(I64 FORMAT_64BIT) -# -# if(NOT FORMAT_64BIT) -# message(FATAL " 64 bit format missing") -# endif(NOT FORMAT_64BIT) -# -# set(PRIX64 "${FORMAT_64BIT}X") -# set(PRIx64 "${FORMAT_64BIT}x") -# set(PRId64 "${FORMAT_64BIT}d") -# set(PRIo64 "${FORMAT_64BIT}o") -# set(PRIu64 "${FORMAT_64BIT}u") - - - -MACRO(CHECK_64BIT_FORMAT FORMAT VARIABLE) - IF(NOT ${VARIABLE}) - SET(FORMAT ${FORMAT}) -#CONFIGURE_FILE("${CMAKE_ROOT}/Modules/Check64BitFormat.c.in" - CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/cmake/modules/Check64BitFormat.c.in" - "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/Check64BitFormat.c" IMMEDIATE @ONLY) - - TRY_RUN(RUN_RESULT_VAR COMPILE_RESULT_VAR - ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/Check64BitFormat.c - OUTPUT_VARIABLE OUTPUT) - - IF(${RUN_RESULT_VAR} STREQUAL "0") - SET(${VARIABLE} 1 CACHE INTERNAL "Have format ${FORMAT}") - MESSAGE(STATUS "Looking for 64bit format ${FORMAT} - found") - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log - "Determining if the format ${FORMAT} runs passed with the following output:\n" - "${OUTPUT}\n\n") - SET(${VARIABLE} ${FORMAT}) - ELSE(${RUN_RESULT_VAR} STREQUAL "0") - MESSAGE(STATUS "Looking for 64bit format ${FORMAT} - not found") - SET(${VARIABLE} "" CACHE INTERNAL "Have format ${FORMAT}") - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log - "Determining if the format ${FORMAT} runs with the following output:\n" - "${OUTPUT}\n\n") - ENDIF(${RUN_RESULT_VAR} STREQUAL "0") - ENDIF(NOT ${VARIABLE}) -ENDMACRO(CHECK_64BIT_FORMAT) diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index 29f96989d1..499b00acd0 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -276,21 +276,6 @@ /* Define to 1 if you have the <grp.h> header file. */ #cmakedefine HAVE_GRP_H 1 -/* Format for printing 64-bit unsigned hexadecimal numbers (upper-case) */ -#cmakedefine PRIX64 @PRIX64@ - -/* Format for printing 64-bit signed decimal numbers */ -#cmakedefine PRId64 @PRId64@ - -/* Format for printing 64-bit unsigned octal numbers */ -#cmakedefine PRIo64 @PRIo64@ - -/* Format for printing 64-bit unsigned decimal numbers */ -#cmakedefine PRIu64 @PRIu64@ - -/* Format for printing 64-bit unsigned hexadecimal numbers (lower-case) */ -#cmakedefine PRIx64 @PRIx64@ - /* Define to 1 if you have the ANSI C header files. */ /* Note: not use in the code */ #cmakedefine STDC_HEADERS 1 |