Skip to content

Fix the windows build #669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 24, 2020
Merged

Fix the windows build #669

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92127f7
Fix the windows build
meshula Mar 24, 2020
dfffc66
Don't need to specify --recursive when cloning
meshula Mar 24, 2020
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
7 changes: 6 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
cmake_minimum_required(VERSION 2.8.12)
if (WINDOWS)
cmake_minimum_required(VERSION 3.17.0)
else()
cmake_minimum_required(VERSION 3.9.4)
endif()

project(OPENTIMELINEIO_ROOT)

add_subdirectory(src)

2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ If you want to contribute to the project, please see: https://opentimelineio.rea

You can get the latest development version via:

`git clone [email protected]:PixarAnimationStudios/OpenTimelineIO.git OpenTimelineIO`
`git clone --recursive [email protected]:PixarAnimationStudios/OpenTimelineIO.git OpenTimelineIO`

You can install development dependencies with `pip install .[dev]`

Expand Down
5 changes: 4 additions & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 3.9.4)

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

if(MSVC)
set(PYBIND11_CPP_STANDARD /std:c++14)
set(CMAKE_CXX_FLAGS "/W4 /EHsc")
Expand Down
5 changes: 4 additions & 1 deletion src/opentime/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ add_library(opentime SHARED
target_include_directories(opentime PUBLIC "${PROJECT_SOURCE_DIR}/src")
set_target_properties(opentime PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
MACOSX_RPATH true WINDOWS_EXPORT_ALL_SYMBOLS true)
install(TARGETS opentime LIBRARY DESTINATION lib)
install(TARGETS opentime
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib)

if (NOT OTIO_CXX_NOINSTALL)
install(FILES ${OPENTIME_HEADER_FILES} DESTINATION include/opentime)
endif (NOT OTIO_CXX_NOINSTALL)
4 changes: 3 additions & 1 deletion src/opentimelineio/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,9 @@ target_include_directories(opentimelineio PUBLIC
target_link_libraries(opentimelineio PUBLIC opentime)
set_target_properties(opentimelineio PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
MACOSX_RPATH true WINDOWS_EXPORT_ALL_SYMBOLS true)
install(TARGETS opentimelineio LIBRARY DESTINATION lib)
install(TARGETS opentimelineio
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib)

if (NOT OTIO_CXX_NOINSTALL)
install(FILES ${OPENTIMELINEIO_HEADER_FILES} DESTINATION include/opentimelineio)
Expand Down