Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
3 changes: 1 addition & 2 deletions examples/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion examples/flatten_video_tracks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 4 additions & 1 deletion examples/util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Loading