From 82b01f764e342f1858d4473c17b56844aac9c12d Mon Sep 17 00:00:00 2001 From: "yuta.256@gmail.com" Date: Thu, 11 Nov 2010 11:01:09 +0000 Subject: Fixed some bugs in CMakeLists.txt. --- CMakeLists.txt | 2 +- include/CMakeLists.txt | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 83c2726..7ceace3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ ### cmake file for building libdivsufsort Package ### -cmake_minimum_required(VERSION 2.4.2) +cmake_minimum_required(VERSION 2.4) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules") include(AppendCompilerFlags) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 6c40cb4..2532e56 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -62,11 +62,11 @@ if(HAVE_UINT8_T) set(SAUCHAR_TYPE "uint8_t") else(HAVE_UINT8_T) check_type_size("unsigned char" SIZEOF_UNSIGNED_CHAR) - if(${SIZEOF_UNSIGNED_CHAR} STREQUAL "1") + if("${SIZEOF_UNSIGNED_CHAR}" STREQUAL "1") set(SAUCHAR_TYPE "unsigned char") - else(${SIZEOF_UNSIGNED_CHAR} STREQUAL "1") + else("${SIZEOF_UNSIGNED_CHAR}" STREQUAL "1") message(FATAL_ERROR "Cannot find unsigned 8-bit integer type") - endif(${SIZEOF_UNSIGNED_CHAR} STREQUAL "1") + endif("${SIZEOF_UNSIGNED_CHAR}" STREQUAL "1") endif(HAVE_UINT8_T) # saint_t (32bit) check_type_size("int32_t" INT32_T) @@ -83,21 +83,21 @@ else(HAVE_INT32_T) check_type_size("long" SIZEOF_LONG) check_type_size("short" SIZEOF_SHORT) check_type_size("__int32" SIZEOF___INT32) - if(${SIZEOF_INT} STREQUAL "4") + if("${SIZEOF_INT}" STREQUAL "4") set(SAINT32_TYPE "int") set(SAINT32_PRId "\"d\"") - elseif(${SIZEOF_LONG} STREQUAL "4") + elseif("${SIZEOF_LONG}" STREQUAL "4") set(SAINT32_TYPE "long") set(SAINT32_PRId "\"ld\"") - elseif(${SIZEOF_SHORT} STREQUAL "4") + elseif("${SIZEOF_SHORT}" STREQUAL "4") set(SAINT32_TYPE "short") set(SAINT32_PRId "\"d\"") - elseif(${SIZEOF___INT32} STREQUAL "4") + elseif("${SIZEOF___INT32}" STREQUAL "4") set(SAINT32_TYPE "__int32") set(SAINT32_PRId "\"d\"") - else(${SIZEOF_INT} STREQUAL "4") + else("${SIZEOF_INT}" STREQUAL "4") message(FATAL_ERROR "Cannot find 32-bit integer type") - endif(${SIZEOF_INT} STREQUAL "4") + endif("${SIZEOF_INT}" STREQUAL "4") endif(HAVE_INT32_T) # saint64_t (64bit) if(BUILD_DIVSUFSORT64) @@ -108,29 +108,29 @@ if(BUILD_DIVSUFSORT64) if(HAVE_PRID64) set(SAINT64_PRId "PRId64") else(HAVE_PRID64) - set(SAINT64_PRId "\"ldd\"") + set(SAINT64_PRId "\"lld\"") endif(HAVE_PRID64) else(HAVE_INT64_T) check_type_size("int" SIZEOF_INT) check_type_size("long" SIZEOF_LONG) check_type_size("long long" SIZEOF_LONG_LONG) check_type_size("__int64" SIZEOF___INT64) - if(${SIZEOF_INT} STREQUAL "8") + if("${SIZEOF_INT}" STREQUAL "8") set(SAINT64_TYPE "int") set(SAINT64_PRId "\"d\"") - elseif(${SIZEOF_LONG} STREQUAL "8") + elseif("${SIZEOF_LONG}" STREQUAL "8") set(SAINT64_TYPE "long") set(SAINT64_PRId "\"ld\"") - elseif(${SIZEOF_LONG_LONG} STREQUAL "8") + elseif("${SIZEOF_LONG_LONG}" STREQUAL "8") set(SAINT64_TYPE "long long") set(SAINT64_PRId "\"lld\"") - elseif(${SIZEOF___INT64} STREQUAL "8") + elseif("${SIZEOF___INT64}" STREQUAL "8") set(SAINT64_TYPE "__int64") set(SAINT64_PRId "\"I64d\"") - else(${SIZEOF_INT} STREQUAL "8") + else("${SIZEOF_INT}" STREQUAL "8") message(SEND_ERROR "Cannot find 64-bit integer type") set(BUILD_DIVSUFSORT64 OFF) - endif(${SIZEOF_INT} STREQUAL "8") + endif("${SIZEOF_INT}" STREQUAL "8") endif(HAVE_INT64_T) endif(BUILD_DIVSUFSORT64) -- cgit v1.2.3