From 6613b6382f55a22a48715025f3294e99f80a0f4b Mon Sep 17 00:00:00 2001 From: Chris Russ Date: Sun, 17 Jul 2016 11:37:20 +1000 Subject: [PATCH] renaming define for double precision to be picked up by cmake correctly --- CMakeLists.txt | 2 +- include/assimp/config.h.in | 2 +- include/assimp/defs.h | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b7ac1af4..af5d06b08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,7 +124,7 @@ IF(NOT GIT_COMMIT_HASH) ENDIF(NOT GIT_COMMIT_HASH) IF(ASSIMP_DOUBLE_PRECISION) - ADD_DEFINITIONS(-DAI_DOUBLE_PRECISION) + ADD_DEFINITIONS(-DASSIMP_DOUBLE_PRECISION) ENDIF(ASSIMP_DOUBLE_PRECISION) configure_file( diff --git a/include/assimp/config.h.in b/include/assimp/config.h.in index ede1d9722..148a68868 100644 --- a/include/assimp/config.h.in +++ b/include/assimp/config.h.in @@ -913,6 +913,6 @@ enum aiComponent * Property type: Bool. Default value: undefined. */ -#cmakedefine AI_DOUBLE_PRECISION 1 +#cmakedefine ASSIMP_DOUBLE_PRECISION 1 #endif // !! AI_CONFIG_H_INC diff --git a/include/assimp/defs.h b/include/assimp/defs.h index 51dc03448..d62dd3097 100644 --- a/include/assimp/defs.h +++ b/include/assimp/defs.h @@ -229,19 +229,19 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endif ////////////////////////////////////////////////////////////////////////// - /* Define AI_DOUBLE_PRECISION to compile assimp + /* Define ASSIMP_DOUBLE_PRECISION to compile assimp * with double precision support (64-bit). */ ////////////////////////////////////////////////////////////////////////// -#ifdef AI_DOUBLE_PRECISION +#ifdef ASSIMP_DOUBLE_PRECISION typedef double ai_real; typedef signed long long int ai_int; typedef unsigned long long int ai_uint; -#else // AI_DOUBLE_PRECISION +#else // ASSIMP_DOUBLE_PRECISION typedef float ai_real; typedef signed int ai_int; typedef unsigned int ai_uint; -#endif // AI_DOUBLE_PRECISION +#endif // ASSIMP_DOUBLE_PRECISION ////////////////////////////////////////////////////////////////////////// /* Useful constants */