Skip to content

Commit 5f3c2c3

Browse files
meshulassteinbach
authored andcommitted
Fix the windows build (#669)
* Fix the windows build * Don't need to specify --recursive when cloning
1 parent 693ebeb commit 5f3c2c3

File tree

5 files changed

+18
-5
lines changed

5 files changed

+18
-5
lines changed

CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1-
cmake_minimum_required(VERSION 2.8.12)
1+
if (WINDOWS)
2+
cmake_minimum_required(VERSION 3.17.0)
3+
else()
4+
cmake_minimum_required(VERSION 3.9.4)
5+
endif()
26

37
project(OPENTIMELINEIO_ROOT)
48

59
add_subdirectory(src)
10+

docs/tutorials/quickstart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Once you have pip installed OpenTimelineIO, you should be able to run:
3030
# Developer Quickstart
3131

3232
0. Get the source and submodules:
33-
+ `git clone --recursive [email protected]:PixarAnimationStudios/OpenTimelineIO.git`
33+
+ `git clone [email protected]:PixarAnimationStudios/OpenTimelineIO.git`
3434

3535
1. To build OTIO for C++ development:
3636

src/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
cmake_minimum_required(VERSION 2.8.12)
1+
cmake_minimum_required(VERSION 3.9.4)
22

33
set(CMAKE_CXX_STANDARD 11)
4+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
5+
set(CMAKE_CXX_EXTENSIONS OFF)
6+
47
if(MSVC)
58
set(PYBIND11_CPP_STANDARD /std:c++14)
69
set(CMAKE_CXX_FLAGS "/W4 /EHsc")

src/opentime/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ add_library(opentime SHARED
1414
target_include_directories(opentime PUBLIC "${PROJECT_SOURCE_DIR}/src")
1515
set_target_properties(opentime PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
1616
MACOSX_RPATH true WINDOWS_EXPORT_ALL_SYMBOLS true)
17-
install(TARGETS opentime LIBRARY DESTINATION lib)
17+
install(TARGETS opentime
18+
RUNTIME DESTINATION bin
19+
LIBRARY DESTINATION lib)
20+
1821
if (NOT OTIO_CXX_NOINSTALL)
1922
install(FILES ${OPENTIME_HEADER_FILES} DESTINATION include/opentime)
2023
endif (NOT OTIO_CXX_NOINSTALL)

src/opentimelineio/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ target_include_directories(opentimelineio PUBLIC
7777
target_link_libraries(opentimelineio PUBLIC opentime)
7878
set_target_properties(opentimelineio PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
7979
MACOSX_RPATH true WINDOWS_EXPORT_ALL_SYMBOLS true)
80-
install(TARGETS opentimelineio LIBRARY DESTINATION lib)
80+
install(TARGETS opentimelineio
81+
RUNTIME DESTINATION bin
82+
LIBRARY DESTINATION lib)
8183

8284
if (NOT OTIO_CXX_NOINSTALL)
8385
install(FILES ${OPENTIMELINEIO_HEADER_FILES} DESTINATION include/opentimelineio)

0 commit comments

Comments
 (0)