Properly defining build-time defines in config.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71e4969..f6a0a4e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,9 +95,17 @@ configure_file(
   ${CMAKE_CURRENT_BINARY_DIR}/revision.h
 )
 
+SET( HEADER_PATH include/assimp )
+
+configure_file(
+  ${HEADER_PATH}/config.h.in
+  ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp/config.h
+)
+
 include_directories(
     ./
     ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}/include
 )
 
 OPTION(ASSIMP_OPT_BUILD_PACKAGES "Set to ON to generate CPack configuration files and packaging targets" OFF)

diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 35ecf50..93fd8e4 100644 (file)
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -58,7 +58,6 @@ SET( PUBLIC_HEADERS
   ${HEADER_PATH}/camera.h
   ${HEADER_PATH}/color4.h
   ${HEADER_PATH}/color4.inl
-  ${HEADER_PATH}/config.h
   ${HEADER_PATH}/defs.h
   ${HEADER_PATH}/cfileio.h
   ${HEADER_PATH}/light.h

diff --git a/include/assimp/Importer.hpp b/include/assimp/Importer.hpp
index 3dd50ef..b18998c 100644 (file)
--- a/include/assimp/Importer.hpp
+++ b/include/assimp/Importer.hpp
@@ -51,8 +51,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif // __cplusplus
 
 // Public ASSIMP data structures
-#include "types.h"
-#include "config.h"
+#include <assimp/types.h>
+#include <assimp/config.h>
 
 namespace Assimp    {
     // =======================================================================

diff --git a/include/assimp/config.h b/include/assimp/config.h.in
similarity index 99%
rename from include/assimp/config.h
rename to include/assimp/config.h.in
index 842646b..ede1d97 100644 (file)
--- a/include/assimp/config.h
+++ b/include/assimp/config.h.in
@@ -905,4 +905,14 @@ enum aiComponent
 
 #define AI_CONFIG_EXPORT_XFILE_64BIT "EXPORT_XFILE_64BIT"
 
+
+// ---------- All the Build/Compile-time defines ------------
+
+/** @brief Specifies if double precision is supported inside assimp
+ *
+ * Property type: Bool. Default value: undefined.
+ */
+
+#cmakedefine AI_DOUBLE_PRECISION 1
+
 #endif // !! AI_CONFIG_H_INC