Refactoring macro and cmake variables.

- Add version macro.
- Change declare macro and plugin id macro.

Author: bluekyu

CMakeLists.txt

@@ -13,10 +13,22 @@ if(CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION)
 endif()
 
 # version
-set(PROJECT_VERSION_MAJOR "1")
-set(PROJECT_VERSION_MINOR "0")
-set(PROJECT_VERSION_PATCH "0")
-set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
+set(RENDER_PIPELINE_VERSION 0)
+file(STRINGS "${PROJECT_SOURCE_DIR}/render_pipeline/rpcore/version.hpp" _RENDER_PIPELINE_VERSION_HPP REGEX "#define RENDER_PIPELINE_VERSION ")
+if("${_RENDER_PIPELINE_VERSION_HPP}" MATCHES "#define RENDER_PIPELINE_VERSION ([0-9]+)")
+    set(RENDER_PIPELINE_VERSION "${CMAKE_MATCH_1}")
+endif()
+unset(_RENDER_PIPELINE_VERSION_HPP)
+
+math(EXPR RENDER_PIPELINE_VERSION_MAJOR "${RENDER_PIPELINE_VERSION} / 10000")
+math(EXPR RENDER_PIPELINE_VERSION_MINOR "${RENDER_PIPELINE_VERSION} / 100 % 100")
+math(EXPR RENDER_PIPELINE_VERSION_PATCH "${RENDER_PIPELINE_VERSION} % 100")
+set(RENDER_PIPELINE_VERSION_TAG "")
+
+set(RENDER_PIPELINE_VERSION "${RENDER_PIPELINE_VERSION_MAJOR}.${RENDER_PIPELINE_VERSION_MINOR}.${RENDER_PIPELINE_VERSION_PATCH}${RENDER_PIPELINE_VERSION_TAG}")
+set(PROJECT_VERSION "${RENDER_PIPELINE_VERSION}")
+
+message("Render Pipeline building version: ${RENDER_PIPELINE_VERSION}")
 
 # configure project package
 include(FindPackages)
@@ -75,23 +87,24 @@ target_link_libraries(${PROJECT_NAME}
 
 set_target_properties(${PROJECT_NAME} PROPERTIES
     FOLDER "render_pipeline"
-    DEFINE_SYMBOL "RPCPP_BUILD"
+    DEFINE_SYMBOL "RENDER_PIPELINE_BUILD"
     DEBUG_POSTFIX "-debug"
     RELWITHDEBINFO_POSTFIX "-reldeb"
     VERSION ${PROJECT_VERSION}
 )
 
 # configure package
 set(PACKAGE_NAME "${PROJECT_NAME}")
-set(PACKAGE_VERSION_CONFIG_FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake")
-set(PACKAGE_CONFIG_FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake")
-set(TARGET_EXPORT_NAME "${PROJECT_NAME}-targets")
+set(PACKAGE_VERSION "${PROJECT_VERSION}")
+set(PACKAGE_VERSION_CONFIG_FILE "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config-version.cmake")
+set(PACKAGE_CONFIG_FILE "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config.cmake")
+set(TARGET_EXPORT_NAME "${PACKAGE_NAME}-targets")
 set(PACKAGE_CMAKE_INSTALL_DIR "lib/${PROJECT_NAME}/cmake")
 file(RELATIVE_PATH PACKAGE_CMAKE_INSTALL_DIR2ROOT_DIR "${CMAKE_INSTALL_PREFIX}/${PACKAGE_CMAKE_INSTALL_DIR}" "${CMAKE_INSTALL_PREFIX}")
 
 include(CMakePackageConfigHelpers)
 write_basic_package_version_file(${PACKAGE_VERSION_CONFIG_FILE}
-    VERSION ${PROJECT_VERSION}
+    VERSION ${PACKAGE_VERSION}
     COMPATIBILITY SameMajorVersion
 )
 configure_package_config_file("${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}-config.cmake.in"
@@ -130,7 +143,7 @@ install(FILES ${PACKAGE_CONFIG_FILE} ${PACKAGE_VERSION_CONFIG_FILE} DESTINATION
 install(EXPORT ${TARGET_EXPORT_NAME} DESTINATION ${PACKAGE_CMAKE_INSTALL_DIR})
 
 # documents
-if(RPCPP_BUILD_DOCUMENTS AND DOXYGEN_FOUND)
+if(RENDER_PIPELINE_BUILD_DOCUMENTS AND DOXYGEN_FOUND)
     set(DOCUMENTS_TARGET "documents")
     configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in"
         "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile"

cmake/FindPackages.cmake

@@ -16,12 +16,12 @@ set(PANDA3D_ROOT "" CACHE PATH "Hint for finding panda3d root directory")
 find_package(panda3d REQUIRED)
 
 # find doxygen
-option(RPCPP_BUILD_DOCUMENTS "Build doxygen documents" OFF)
-option(RPCPP_DOXYGEN_SKIP_DOT "Skip to find Dot for Doxygen" ON)
-if(RPCPP_BUILD_DOCUMENTS)
+option(RENDER_PIPELINE_BUILD_DOCUMENTS "Build doxygen documents" OFF)
+option(RENDER_PIPELINE_DOXYGEN_SKIP_DOT "Skip to find Dot for Doxygen" ON)
+if(RENDER_PIPELINE_BUILD_DOCUMENTS)
     find_package(doxygen REQUIRED)
     set(DOXYGEN_HAVE_DOT "NO")
-    if(NOT RPCPP_DOXYGEN_SKIP_DOT)
+    if(NOT RENDER_PIPELINE_DOXYGEN_SKIP_DOT)
         set(DOXYGEN_HAVE_DOT "YES")
     endif()
 endif()

cmake/render_pipeline-config.cmake.in

@@ -1,5 +1,7 @@
 @PACKAGE_INIT@
 
+set (@PACKAGE_NAME@_VERSION "@PACKAGE_VERSION@")
+
 include(${CMAKE_CURRENT_LIST_DIR}/@TARGET_EXPORT_NAME@.cmake)
 
 set(@PACKAGE_NAME@_INSTALL_DIR "${CMAKE_CURRENT_LIST_DIR}/@PACKAGE_CMAKE_INSTALL_DIR2ROOT_DIR@")

files.cmake

@@ -48,6 +48,7 @@ set(header_rpcore
     "${PROJECT_SOURCE_DIR}/render_pipeline/rpcore/render_target.h"
     "${PROJECT_SOURCE_DIR}/render_pipeline/rpcore/rpobject.h"
     "${PROJECT_SOURCE_DIR}/render_pipeline/rpcore/stage_manager.h"
+    "${PROJECT_SOURCE_DIR}/render_pipeline/rpcore/version.hpp"
 )
 
 set(header_rpcore_gui

render_pipeline/rpcore/config.h

@@ -2,8 +2,8 @@
 
 #include <boost/config.hpp>
 
-#if defined(RPCPP_BUILD)
-#   define RPCPP_DECL BOOST_SYMBOL_EXPORT
+#if defined(RENDER_PIPELINE_BUILD)
+#   define RENDER_PIPELINE_DECL BOOST_SYMBOL_EXPORT
 #else
-#   define RPCPP_DECL BOOST_SYMBOL_IMPORT
+#   define RENDER_PIPELINE_DECL BOOST_SYMBOL_IMPORT
 #endif

render_pipeline/rpcore/effect.h

@@ -13,7 +13,7 @@ namespace rpcore {
  * This class represents an instance of a compiled effect. It can be loaded
  * from a file.
  */
-class RPCPP_DECL Effect: public RPObject
+class RENDER_PIPELINE_DECL Effect: public RPObject
 {
 public:
     using OptionType = std::map<std::string, bool>;

render_pipeline/rpcore/globals.h

@@ -17,7 +17,7 @@ namespace rpcore {
  * which is bad practice. This class also attempts to help IDEs to figure out
  * where the variables come from and where they are defined.
  */
-class RPCPP_DECL Globals
+class RENDER_PIPELINE_DECL Globals
 {
 public:
 	static void load(rppanda::ShowBase* showbase);

render_pipeline/rpcore/gui/checkbox.h

@@ -16,7 +16,7 @@ namespace rpcore {
  * This is a wrapper around DirectCheckBox, providing a simpler interface
  * and better visuals.
  */
-class RPCPP_DECL Checkbox: public RPObject
+class RENDER_PIPELINE_DECL Checkbox: public RPObject
 {
 public:
 	struct Parameters

render_pipeline/rpcore/gui/labeled_checkbox.h

@@ -12,7 +12,7 @@ class Text;
  * This is a checkbox, combined with a label. The arguments are
  * equal to the Checkbox and OnscreenText arguments.
  */
-class RPCPP_DECL LabeledCheckbox: public RPObject
+class RENDER_PIPELINE_DECL LabeledCheckbox: public RPObject
 {
 public:
 	struct Parameters: public Checkbox::Parameters

render_pipeline/rpcore/image.h

@@ -15,7 +15,7 @@ namespace rpcore {
  * the memory used. This is used by all classes instead of pandas builtin
  * Texture class.
  */
-class RPCPP_DECL Image: public RPObject
+class RENDER_PIPELINE_DECL Image: public RPObject
 {
 public:
     using ComponentFormatType = std::pair<Texture::ComponentType, Texture::Format>;