Put back variable to define patch value.

Fix python builds.

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

Author: peter-targett

CMakeLists.txt

@@ -8,7 +8,8 @@ cmake_minimum_required(VERSION 3.18.2)
 
 set(OTIO_VERSION_MAJOR "0")
 set(OTIO_VERSION_MINOR "18")
-set(OTIO_VERSION ${OTIO_VERSION_MAJOR}.${OTIO_VERSION_MINOR}.0)
+set(OTIO_VERSION_PATCH "0")
+set(OTIO_VERSION ${OTIO_VERSION_MAJOR}.${OTIO_VERSION_MINOR}.${OTIO_VERSION_PATCH})
 
 set(OTIO_AUTHOR       "Contributors to the OpenTimelineIO project")
 set(OTIO_AUTHOR_EMAIL "[email protected]")

src/opentime/CMakeLists.txt

@@ -47,6 +47,11 @@ target_compile_options(opentime PRIVATE
      $<$<CXX_COMPILER_ID:MSVC>: /EHsc>
 )
 
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/version.h.in
+    ${CMAKE_CURRENT_BINARY_DIR}/version.h
+)
+
 if(OTIO_CXX_INSTALL)
     install(FILES ${OPENTIME_HEADER_FILES} 
             DESTINATION "${OTIO_RESOLVED_CXX_INSTALL_DIR}/include/opentime")
@@ -78,10 +83,7 @@ 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

src/opentime/version.h.in

@@ -3,7 +3,10 @@
 
 #pragma once
 
-#define OPENTIME_VERSION v@PROJECT_VERSION_MAJOR@_@OpenTimelineIO_VERSION_MINOR@
+#define OPENTIME_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
+#define OPENTIME_VERSION_MINOR @PROJECT_VERSION_MINOR@
+#define OPENTIME_VERSION_PATCH @PROJECT_VERSION_PATCH@
+#define OPENTIME_VERSION v@PROJECT_VERSION_MAJOR@_@PROJECT_VERSION_MINOR@_@PROJECT_VERSION_PATCH@
 
 namespace opentime {
 namespace OPENTIME_VERSION {

src/opentimelineio/CMakeLists.txt

@@ -121,6 +121,11 @@ target_compile_options(opentimelineio PRIVATE
      $<$<CXX_COMPILER_ID:MSVC>: /EHsc>
 )
 
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/version.h.in
+    ${CMAKE_CURRENT_BINARY_DIR}/version.h
+)
+
 if(OTIO_CXX_INSTALL)
     install(FILES ${OPENTIMELINEIO_HEADER_FILES} 
             DESTINATION "${OTIO_RESOLVED_CXX_INSTALL_DIR}/include/opentimelineio")
@@ -154,10 +159,7 @@ 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

src/opentimelineio/version.h.in

@@ -3,7 +3,10 @@
 
 #pragma once
 
-#define OPENTIMELINEIO_VERSION v@PROJECT_VERSION_MAJOR@_@OpenTimelineIO_VERSION_MINOR@
+#define OPENTIMELINEIO_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
+#define OPENTIMELINEIO_VERSION_MINOR @PROJECT_VERSION_MINOR@
+#define OPENTIMELINEIO_VERSION_PATCH @PROJECT_VERSION_PATCH@
+#define OPENTIMELINEIO_VERSION v@PROJECT_VERSION_MAJOR@_@PROJECT_VERSION_MINOR@_@PROJECT_VERSION_PATCH@
 
 #include "opentime/rationalTime.h"
 #include "opentime/timeRange.h"

src/py-opentimelineio/opentime-bindings/CMakeLists.txt

@@ -12,7 +12,9 @@ target_include_directories(_opentime
     PRIVATE pybind11/include
     PRIVATE "${PROJECT_SOURCE_DIR}/src"
     PRIVATE "${PROJECT_SOURCE_DIR}/src/deps"
-    PRIVATE "${PROJECT_SOURCE_DIR}/src/deps/optional-lite/include")
+    PRIVATE "${PROJECT_SOURCE_DIR}/src/deps/optional-lite/include"
+    PRIVATE "${CMAKE_BINARY_DIR}/src"
+)
 
 target_link_libraries(_opentime PUBLIC opentimelineio opentime)
 

src/py-opentimelineio/opentimelineio-bindings/CMakeLists.txt

@@ -23,6 +23,7 @@ target_include_directories(_otio
     PRIVATE "${PROJECT_SOURCE_DIR}/src"
     PRIVATE "${PROJECT_SOURCE_DIR}/src/deps"
     PRIVATE "${PROJECT_SOURCE_DIR}/src/deps/optional-lite/include"
+    PRIVATE "${CMAKE_BINARY_DIR}/src"
 )
 
 target_link_libraries(_otio PUBLIC opentimelineio opentime)