Uae existing version.h headers to add the project version.

Signed-off-by: Peter Targett <[email protected]>

Author: peter-targett

CMakeLists.txt

@@ -8,8 +8,7 @@ cmake_minimum_required(VERSION 3.18.2)
 
 set(OTIO_VERSION_MAJOR "0")
 set(OTIO_VERSION_MINOR "18")
-set(OTIO_VERSION_PATCH "0")
-set(OTIO_VERSION ${OTIO_VERSION_MAJOR}.${OTIO_VERSION_MINOR}.${OTIO_VERSION_PATCH})
+set(OTIO_VERSION ${OTIO_VERSION_MAJOR}.${OTIO_VERSION_MINOR}.0)
 
 set(OTIO_AUTHOR       "Contributors to the OpenTimelineIO project")
 set(OTIO_AUTHOR_EMAIL "[email protected]")
@@ -154,16 +153,6 @@ if(OTIO_CXX_INSTALL)
     else()
         message(STATUS "  Not installing header dependencies for C++ (OTIO_DEPENDENCIES_INSTALL=OFF)")
     endif()
-    configure_file(
-        ${PROJECT_SOURCE_DIR}/src/OpenTimelineIO-Version.h.in
-        ${CMAKE_CURRENT_BINARY_DIR}/OpenTimelineIO-Version.h
-    )
-    install(
-        FILES
-            ${CMAKE_CURRENT_BINARY_DIR}/OpenTimelineIO-Version.h
-        DESTINATION
-            ${OTIO_RESOLVED_CXX_INSTALL_DIR}/include
-    )
 else()
     message(STATUS "Install C++ bindings: OFF")
 endif()

src/OpenTimelineIO-Version.h.in

@@ -6,8 +6,7 @@ set(OPENTIME_HEADER_FILES
     rationalTime.h
     stringPrintf.h
     timeRange.h
-    timeTransform.h
-    version.h)
+    timeTransform.h)
 
 add_library(opentime ${OTIO_SHARED_OR_STATIC_LIB} 
             errorStatus.cpp
@@ -16,7 +15,12 @@ add_library(opentime ${OTIO_SHARED_OR_STATIC_LIB}
 
 add_library(OTIO::opentime ALIAS opentime)
 
-target_include_directories(opentime PRIVATE "${PROJECT_SOURCE_DIR}/src")
+target_include_directories(
+    opentime
+    PRIVATE
+        "${PROJECT_SOURCE_DIR}/src"
+        "${CMAKE_CURRENT_BINARY_DIR}/.."
+)
 
 set_target_properties(opentime PROPERTIES 
     DEBUG_POSTFIX "${OTIO_DEBUG_POSTFIX}"
@@ -74,5 +78,15 @@ if(OTIO_CXX_INSTALL)
         DESTINATION
             ${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentime
     )
+    configure_file(
+        ${CMAKE_CURRENT_SOURCE_DIR}/version.h.in
+        ${CMAKE_CURRENT_BINARY_DIR}/version.h
+    )
+    install(
+        FILES
+            ${CMAKE_CURRENT_BINARY_DIR}/version.h
+        DESTINATION
+            "${OTIO_RESOLVED_CXX_INSTALL_DIR}/include/opentime"
+    )
 endif()
 

src/opentime/CMakeLists.txt

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#define OPENTIME_VERSION v1_0
+#define OPENTIME_VERSION v@PROJECT_VERSION_MAJOR@_@OpenTimelineIO_VERSION_MINOR@
 
 namespace opentime {
 namespace OPENTIME_VERSION {

src/opentime/version.h src/opentime/version.h.insrc/opentime/version.h renamed to src/opentime/version.h.in

@@ -35,8 +35,7 @@ set(OPENTIMELINEIO_HEADER_FILES
     transition.h
     typeRegistry.h
     unknownSchema.h
-    vectorIndexing.h
-    version.h)
+    vectorIndexing.h)
 
 add_library(opentimelineio ${OTIO_SHARED_OR_STATIC_LIB} 
     clip.cpp
@@ -77,8 +76,12 @@ add_library(opentimelineio ${OTIO_SHARED_OR_STATIC_LIB}
 
 add_library(OTIO::opentimelineio ALIAS opentimelineio)
 
-target_include_directories(opentimelineio
-    PRIVATE "${PROJECT_SOURCE_DIR}/src")
+target_include_directories(
+    opentimelineio
+    PRIVATE
+        "${PROJECT_SOURCE_DIR}/src"
+        "${CMAKE_CURRENT_BINARY_DIR}/.."
+)
 
 if(OTIO_FIND_RAPIDJSON)
     target_include_directories(opentimelineio
@@ -151,4 +154,14 @@ if(OTIO_CXX_INSTALL)
         DESTINATION
             ${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentimelineio
     )
+    configure_file(
+        ${CMAKE_CURRENT_SOURCE_DIR}/version.h.in
+        ${CMAKE_CURRENT_BINARY_DIR}/version.h
+    )
+    install(
+        FILES
+            ${CMAKE_CURRENT_BINARY_DIR}/version.h
+        DESTINATION
+            "${OTIO_RESOLVED_CXX_INSTALL_DIR}/include/opentimelineio"
+    )
 endif()

src/opentimelineio/CMakeLists.txt

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#define OPENTIMELINEIO_VERSION v1_0
+#define OPENTIMELINEIO_VERSION v@PROJECT_VERSION_MAJOR@_@OpenTimelineIO_VERSION_MINOR@
 
 #include "opentime/rationalTime.h"
 #include "opentime/timeRange.h"

src/opentimelineio/version.h src/opentimelineio/version.h.insrc/opentimelineio/version.h renamed to src/opentimelineio/version.h.in

@@ -1,7 +1,10 @@
-include_directories(${PROJECT_SOURCE_DIR}/src
+include_directories(
+    ${PROJECT_SOURCE_DIR}/src
     ${PROJECT_SOURCE_DIR}/src/deps
     ${PROJECT_SOURCE_DIR}/src/deps/optional-lite/include
-	${PROJECT_SOURCE_DIR}/src/tests)
+    ${PROJECT_SOURCE_DIR}/src/tests
+    ${CMAKE_BINARY_DIR}/src
+)
 
 list(APPEND tests_opentime test_opentime)
 foreach(test ${tests_opentime})

tests/CMakeLists.txt

@@ -28,7 +28,7 @@ main(int argc, char** argv)
         SerializableObject::Retainer<Item>  item  = new Item;
 
         comp->append_child(item);
-        opentimelineio::v1_0::ErrorStatus err;
+        OTIO_NS::ErrorStatus err;
         auto result = comp->find_children<>(&err);
         assertEqual(result.size(), 1);
         assertEqual(result[0].value, item.value);
@@ -47,7 +47,7 @@ main(int argc, char** argv)
         track->append_child(transition);
         track->append_child(clip);
 
-        opentimelineio::v1_0::ErrorStatus err;
+        OTIO_NS::ErrorStatus err;
         auto items = stack->find_clips(&err);
         assertFalse(is_error(err));
         assertEqual(items.size(), 1);

tests/test_composition.cpp

@@ -32,7 +32,7 @@ main(int argc, char** argv)
         otio::SerializableObject::Retainer<otio::SerializableCollection>
             sc = new otio::SerializableCollection();
         sc->insert_child(0, tl);
-        opentimelineio::v1_0::ErrorStatus err;
+        OTIO_NS::ErrorStatus err;
         auto result = sc->find_children<otio::Clip>(&err, {}, false);
         assertEqual(result.size(), 1);
         assertEqual(result[0].value, cl.value);
@@ -61,7 +61,7 @@ main(int argc, char** argv)
         otio::SerializableObject::Retainer<otio::SerializableCollection>
             sc = new otio::SerializableCollection();
         sc->insert_child(0, tl);
-        opentimelineio::v1_0::ErrorStatus err;
+        OTIO_NS::ErrorStatus err;
         auto result = sc->find_children<otio::Clip>(&err, range);
         assertEqual(result.size(), 1);
         assertEqual(result[0].value, cl0.value);
@@ -80,7 +80,7 @@ main(int argc, char** argv)
         otio::SerializableObject::Retainer<otio::SerializableCollection>
             sc = new otio::SerializableCollection();
         sc->insert_child(0, tl);
-        opentimelineio::v1_0::ErrorStatus err;
+        OTIO_NS::ErrorStatus err;
         auto result = sc->find_children<otio::Clip>(&err, std::nullopt, true);
         assertEqual(result.size(), 0);
         result = sc->find_children<otio::Clip>(&err, std::nullopt, false);

tests/test_serializableCollection.cpp

@@ -28,7 +28,7 @@ main(int argc, char** argv)
         otio::SerializableObject::Retainer<otio::Timeline> tl =
             new otio::Timeline();
         tl->tracks()->append_child(tr);
-        opentimelineio::v1_0::ErrorStatus err;
+        OTIO_NS::ErrorStatus err;
         auto result = tl->find_children<otio::Clip>(&err);
         assertEqual(result.size(), 1);
         assertEqual(result[0].value, cl.value);
@@ -54,7 +54,7 @@ main(int argc, char** argv)
         otio::SerializableObject::Retainer<otio::Timeline> tl =
             new otio::Timeline();
         tl->tracks()->append_child(tr);
-        opentimelineio::v1_0::ErrorStatus err;
+        OTIO_NS::ErrorStatus err;
         auto result = tl->find_children<otio::Clip>(&err, range);
         assertEqual(result.size(), 1);
         assertEqual(result[0].value, cl0.value);
@@ -70,7 +70,7 @@ main(int argc, char** argv)
         otio::SerializableObject::Retainer<otio::Timeline> tl =
             new otio::Timeline();
         tl->tracks()->append_child(tr);
-        opentimelineio::v1_0::ErrorStatus err;
+        OTIO_NS::ErrorStatus err;
         auto result = tl->find_children<otio::Clip>(&err, std::nullopt, true);
         assertEqual(result.size(), 0);
         result = tl->find_children<otio::Clip>(&err, std::nullopt, false);