renaming define for double precision to be picked up by cmake correctly

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b7ac1a..af5d06b 100644 (file)
--- 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 ede1d97..148a688 100644 (file)
--- 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 51dc034..d62dd30 100644 (file)
--- 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 */