CMake : Use check_type_size as needed.

2 files changed, 43 insertions, 9 deletions

diff --git a/CMake/libsndfile.cmake b/CMake/libsndfile.cmake
index 7aa3361..09dd9d9 100644
--- a/CMake/libsndfile.cmake
+++ b/CMake/libsndfile.cmake
@@ -1,4 +1,5 @@
 
+include (CheckTypeSize)
 include (TestBigEndian)
 
 function (try_compile_c_result C_FILE RESULT_NAME RESULT_PASS RESULT_FAIL)
@@ -16,5 +17,21 @@ function (try_compile_c_result C_FILE RESULT_NAME RESULT_PASS RESULT_FAIL)
 
 	endfunction ()
 
+check_type_size (double SIZEOF_DOUBLE)
+check_type_size (float SIZEOF_FLOAT)
+check_type_size (int SIZEOF_INT)
+check_type_size (int64_t SIZEOF_INT64_T)
+check_type_size (loff_t SIZEOF_LOFF_T)
+check_type_size (long SIZEOF_LONG)
+check_type_size (long\ long SIZEOF_LONG_LONG)
+check_type_size (offt64_t SIZEOF_OFF64_T)
+check_type_size (off_t SIZEOF_OFF_T)
+check_type_size (short SIZEOF_SHORT)
+check_type_size (size_t SIZEOF_SIZE_T)
+check_type_size (ssize_t SIZEOF_SSIZE_T)
+check_type_size (void* SIZEOF_VOIDP)
+check_type_size (wchar_t SIZEOF_WCHAR_T)
+
+set (SIZEOF_SF_COUNT_T ${SIZEOF_INT64_T})
 
 try_compile_c_result (CMake/compiler_is_gcc.c COMPILER_IS_GCC 1 0)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fdda99b..a82b67a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,26 +20,43 @@ if (MSVC)
 	set (USE_WINDOWS_API 1)
 else (MSVC)
 	# Assume this is Linux or some other POSIX-like system (including OS X).
+	set (OS_IS_WIN32 0)
+	set (USE_WINDOWS_API 0)
+	set (COMPILER_IS_GCC ${COMPILER_IS_GCC})
+
+	set (SIZEOF_DOUBLE ${SIZEOF_DOUBLE})
+	set (SIZEOF_FLOAT ${SIZEOF_FLOAT})
+	set (SIZEOF_INT ${SIZEOF_INT})
+	set (SIZEOF_INT64_T ${SIZEOF_INT64_T})
+	set (SIZEOF_LOFF_T ${SIZEOF_LOFF_T})
+	set (SIZEOF_LONG ${SIZEOF_LONG})
+	set (SIZEOF_LONG_LONG ${SIZEOF_LONG_LONG})
+	set (SIZEOF_OFF64_T ${SIZEOF_OFF64_T})
+	set (SIZEOF_OFF_T ${SIZEOF_OFF_T})
+	set (SIZEOF_SF_COUNT_T ${SIZEOF_INT64_T})
+	set (SIZEOF_SHORT ${SIZEOF_SHORT})
+	set (SIZEOF_SIZE_T ${SIZEOF_SIZE_T})
+	set (SIZEOF_SSIZE_T ${SIZEOF_SSIZE_T})
+	set (SIZEOF_VOIDP ${SIZEOF_VOIDP})
+	set (SIZEOF_WCHAR_T ${SIZEOF_WCHAR_T})
+
+
+
 	set (HAVE_BYTESWAP_H 1)
 	set (HAVE_INTTYPES_H 1)
 	set (HAVE_STDINT_H 1)
-	set (SIZEOF_LONG 4)
-	set (COMPILER_IS_GCC ${COMPILER_IS_GCC})
-	set (OS_IS_WIN32 0)
-	set (USE_WINDOWS_API 0)
-	set (SIZEOF_INT64_T 8)
-	set (SIZEOF_WCHAR_T 2)
-	set (SIZEOF_LONG_LONG 8)
-	set (SIZEOF_OFF_T 8)
+
 	set (HAVE_UNISTD_H 1)
 	set (HAVE_EXTERNAL_LIBS 0)
 	set (CPU_CLIPS_NEGATIVE 0)
 	set (CPU_CLIPS_POSITIVE 0)
 	set (HAVE_GETTIMEOFDAY 1)
-	set (SIZEOF_SF_COUNT_T ${SIZEOF_INT64_T})
 	set (HAVE_SYS_TIME_H 1)
 	set (_POSIX_SOURCE 1)
+
+	set (SIZEOF_SF_COUNT_T ${SIZEOF_INT64_T})
 	set (TYPEOF_SF_COUNT_T int64_t)
+
 	set (SF_COUNT_MAX 0x7fffffffffffffffll)
 	set (ENABLE_EXPERIMENTAL_CODE 0)
 	set (HAVE_DECL_S_IRGRP 1)