Finalize CLN 1.3.7 release.

[cln.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba2d356a716d491fe741eaca17652fc673324d1f..3db992631e782016b96cbbe5e1955f401c488096 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,7 +32,7 @@ set(cl_config_files
        include/cln/config.h
        include/cln/host_cpu.h
        include/cln/intparam.h
-       src/cl_config.h
+       autoconf/cl_config.h
        src/base/cl_base_config.h
        src/base/cl_gmpconfig.h
        src/timing/cl_t_config.h
@@ -91,13 +91,10 @@ if (GMP_FOUND)
 endif(GMP_FOUND)
 
 
-check_type_size("long long" LONGLONG)
-if (HAVE_LONGLONG)
-       set(SIZEOF_LONGLONG ${LONGLONG})
-endif()
 check_type_size("short" SIZEOF_SHORT)
 check_type_size("int" SIZEOF_INT)
 check_type_size("long" SIZEOF_LONG)
+check_type_size("long long" SIZEOF_LONGLONG)
 check_type_size("void *" SIZEOF_VOIDP)
 check_type_align("void *" ALIGNOF_VOIDP)
 
@@ -107,10 +104,8 @@ math(EXPR x "${SIZEOF_SHORT} * ${cl_char_bitsize}")
 set(cl_short_bitsize ${x} CACHE INTERNAL "short_bitsize")
 math(EXPR cl_int_bitsize "${SIZEOF_INT} * ${cl_char_bitsize}")
 math(EXPR cl_long_bitsize "${SIZEOF_LONG} * ${cl_char_bitsize}")
+math(EXPR cl_long_long_bitsize "${SIZEOF_LONGLONG} * ${cl_char_bitsize}")
 math(EXPR cl_pointer_bitsize "${SIZEOF_VOIDP} * ${cl_char_bitsize}")
-if (HAVE_LONGLONG)
-       math(EXPR cl_long_long_bitsize "${SIZEOF_LONGLONG} * ${cl_char_bitsize}")
-endif()
 
 
 check_include_file("unistd.h" HAVE_UNISTD_H)
@@ -138,10 +133,12 @@ if(cl_cv_bigendian_p)
        set(short_big_endian 1 CACHE INTERNAL "CPU is big endian")
        set(int_big_endian 1 CACHE INTERNAL "CPU is big endian")
        set(long_big_endian 1 CACHE INTERNAL "CPU is big endian")
+       set(long_long_big_endian 1 CACHE INTERNAL "CPU is big endian")
 else()
        set(short_little_endian 1 CACHE INTERNAL "CPU is little endian")
        set(int_little_endian 1 CACHE INTERNAL "CPU is little endian")
        set(long_little_endian 1 CACHE INTERNAL "CPU is little endian")
+       set(long_long_little_endian 1 CACHE INTERNAL "CPU is little endian")
 endif()
 
 include(AsmUnderscore)