Move AF_REVISION and AF_COMPILER_STR to backend/version.hpp

shehzan10 · shehzan10 · commit 2287c5ca6a3a · 2015-12-08T14:38:12.000-05:00
* AF_REVISION was in version.h which is included in defines.h
    * Which meant with each new commit, the entire source would have to be
      rebuilt
* AF_REVISION is only required by src/backend/*/platform.cpp
* So AF_REVISION has been moved into backend/version.hpp and is compiled into
  the library
* Renamed AF_CMPLR_STR to AF_COMPILER_STR
* Moved AF_COMPILER_STR into version.hpp as it is also only required by
  backend/platform.cpp
* src/backend/version.hpp is generated by CMake using Version.cmake
  and version.hpp.in
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,5 @@ GRTAGS
 GPATH
 .dir-locals.el
 include/af/version.h
+src/backend/version.hpp
 docs/details/examples.dox
diff --git a/CMakeModules/Version.cmake b/CMakeModules/Version.cmake
@@ -36,3 +36,8 @@ CONFIGURE_FILE(
     ${CMAKE_MODULE_PATH}/version.h.in
     ${CMAKE_SOURCE_DIR}/include/af/version.h
 )
+
+CONFIGURE_FILE(
+    ${CMAKE_MODULE_PATH}/version.hpp.in
+    ${CMAKE_SOURCE_DIR}/src/backend/version.hpp
+)
diff --git a/CMakeModules/version.h.in b/CMakeModules/version.h.in
@@ -14,5 +14,3 @@
 #define AF_VERSION_MINOR @AF_VERSION_MINOR@
 #define AF_VERSION_PATCH @AF_VERSION_PATCH@
 #define AF_API_VERSION_CURRENT   @AF_API_VERSION_CURRENT@
-#define AF_REVISION "@GIT_COMMIT_HASH@"
-#define AF_CMPLR_STR "@AF_COMPILER_STRING@"
diff --git a/CMakeModules/version.hpp.in b/CMakeModules/version.hpp.in
@@ -0,0 +1,13 @@
+/*******************************************************
+ * Copyright (c) 2014, ArrayFire
+ * All rights reserved.
+ *
+ * This file is distributed under 3-clause BSD license.
+ * The complete license agreement can be obtained at:
+ * http://arrayfire.com/licenses/BSD-3-Clause
+ ********************************************************/
+
+#pragma once
+
+#define AF_REVISION "@GIT_COMMIT_HASH@"
+#define AF_COMPILER_STR "@AF_COMPILER_STRING@"
diff --git a/src/backend/cpu/platform.cpp b/src/backend/cpu/platform.cpp
@@ -15,6 +15,7 @@
 #include <iostream>
 #include <string>
 #include <defines.hpp>
+#include <version.hpp>
 
 #ifdef _WIN32
 #include <limits.h>
@@ -203,7 +204,7 @@ std::string getInfo()
     info << string("[0] ") << cinfo.vendor() <<": " << cinfo.model() << " ";
     info << "Max threads("<< cinfo.threads()<<") ";
 #ifndef NDEBUG
-    info << AF_CMPLR_STR;
+    info << AF_COMPILER_STR;
 #endif
     info << std::endl;
     return info.str();
@@ -220,7 +221,7 @@ void devprop(char* d_name, char* d_platform, char *d_toolkit, char* d_compute)
     snprintf(d_name, 64, "%s", cinfo.vendor().c_str());
     snprintf(d_platform, 10, "CPU");
     // report the compiler for toolkit
-    snprintf(d_toolkit, 64, "%s", AF_CMPLR_STR);
+    snprintf(d_toolkit, 64, "%s", AF_COMPILER_STR);
     snprintf(d_compute, 10, "%s", "0.0");
 }
 
diff --git a/src/backend/cuda/platform.cpp b/src/backend/cuda/platform.cpp
@@ -11,6 +11,7 @@
 #include <af/cuda.h>
 #include <platform.hpp>
 #include <defines.hpp>
+#include <version.hpp>
 #include <driver.h>
 #include <vector>
 #include <string>
diff --git a/src/backend/opencl/platform.cpp b/src/backend/opencl/platform.cpp
@@ -27,6 +27,7 @@
 #include <af/version.h>
 #include <af/opencl.h>
 #include <defines.hpp>
+#include <version.hpp>
 #include <platform.hpp>
 #include <functional>
 #include <algorithm>

Original file line number	Diff line number	Diff line change
`@@ -36,3 +36,8 @@ CONFIGURE_FILE(`
`36`	`36`	`${CMAKE_MODULE_PATH}/version.h.in`
`37`	`37`	`${CMAKE_SOURCE_DIR}/include/af/version.h`
`38`	`38`	`)`
	`39`	`+`
	`40`	`+CONFIGURE_FILE(`
	`41`	`+ ${CMAKE_MODULE_PATH}/version.hpp.in`
	`42`	`+ ${CMAKE_SOURCE_DIR}/src/backend/version.hpp`
	`43`	`+)`