From 210ada36626f017ec31b2c00ba5a4bf6884f6acc Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Sat, 1 Nov 2025 08:30:44 -0700 Subject: [PATCH 1/4] Fix include directories Signed-off-by: Darby Johnston --- examples/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 960a996257..9a07779301 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,8 +1,7 @@ find_package(PythonLibs REQUIRED) include_directories(${PROJECT_SOURCE_DIR}/src - ${PROJECT_SOURCE_DIR}/src/deps - ${PROJECT_SOURCE_DIR}/src/deps/optional-lite/include + ${CMAKE_CURRENT_BINARY_DIR}/../src ${PYTHON_INCLUDE_DIRS}) list(APPEND examples conform) From 73f2a6696cd7209705836943b22b5789bc73d864 Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Sat, 1 Nov 2025 08:31:20 -0700 Subject: [PATCH 2/4] Change conditional for VS Signed-off-by: Darby Johnston --- examples/flatten_video_tracks.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/flatten_video_tracks.cpp b/examples/flatten_video_tracks.cpp index db3c3c4a4b..203b2a36fc 100644 --- a/examples/flatten_video_tracks.cpp +++ b/examples/flatten_video_tracks.cpp @@ -38,7 +38,7 @@ int main(int argc, char** argv) // into a single track. std::cout << "Flattening " << video_tracks.size() << " video tracks into one..." << std::endl; auto onetrack = otio::flatten_stack(video_tracks, &error_status); - if (!onetrack or is_error(error_status)) + if (!onetrack || is_error(error_status)) { examples::print_error(error_status); return 1; From ab4b55010188652bcf2fc56efe0fc70748593298 Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Sat, 1 Nov 2025 08:31:39 -0700 Subject: [PATCH 3/4] Enable examples in CI Signed-off-by: Darby Johnston --- .github/workflows/python-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index fa3b768d04..b5f8472f49 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -55,7 +55,7 @@ jobs: run: | cmake -E make_directory ${{ env.OTIO_BUILD_DIR }} cd ${{ env.OTIO_BUILD_DIR }} - cmake ${{ github.workspace }} -DCMAKE_INSTALL_PREFIX=${{ env.OTIO_INSTALL_DIR }} -DOTIO_SHARED_LIBS=OFF -DOTIO_CXX_COVERAGE=ON + cmake ${{ github.workspace }} -DCMAKE_INSTALL_PREFIX=${{ env.OTIO_INSTALL_DIR }} -DOTIO_SHARED_LIBS=OFF -DOTIO_CXX_COVERAGE=ON -DOTIO_CXX_EXAMPLES=ON cmake --build . --config ${{ env.OTIO_BUILD_CONFIG }} - name: Run tests run: | From f903f5f9ad717611fb7f7d350a3b4ebb369a7eff Mon Sep 17 00:00:00 2001 From: Darby Johnston Date: Sat, 1 Nov 2025 08:52:07 -0700 Subject: [PATCH 4/4] Fix warning about ignored return variable Signed-off-by: Darby Johnston --- examples/util.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/util.cpp b/examples/util.cpp index df8a434509..cc54d05aff 100644 --- a/examples/util.cpp +++ b/examples/util.cpp @@ -132,7 +132,10 @@ std::string normalize_path(std::string const& in) std::string absolute(std::string const& in) { char buf[PATH_MAX]; - realpath(in.c_str(), buf); + if (NULL == realpath(in.c_str(), buf)) + { + buf[0] = 0; + } return buf; }