Commit e3ddbc8f authored by Boudewijn Rempt's avatar Boudewijn Rempt

Anoter attempt at fixing the ocio patches

parent 8b7bac20
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e36ca5..ba420d4 100644
index b539ea1..ab47729 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,12 @@ if(NOT DEFINED CMAKE_FIRST_RUN)
......@@ -15,7 +15,7 @@ index 3e36ca5..ba420d4 100644
###############################################################################
### GLOBAL ###
@@ -171,7 +177,7 @@ else(USE_EXTERNAL_TINYXML)
@@ -183,7 +189,7 @@ else(USE_EXTERNAL_TINYXML)
endif()
ExternalProject_Add(tinyxml
URL ${CMAKE_SOURCE_DIR}/ext/tinyxml_${TINYXML_VERSION}.tar.gz
......@@ -24,7 +24,7 @@ index 3e36ca5..ba420d4 100644
BINARY_DIR ext/build/tinyxml
INSTALL_DIR ext/dist
CMAKE_ARGS ${TINYXML_CMAKE_ARGS}
@@ -211,7 +217,7 @@ else(USE_EXTERNAL_YAML)
@@ -252,7 +258,7 @@ else(USE_EXTERNAL_YAML)
ExternalProject_Add(YAML_CPP_LOCAL
URL ${CMAKE_SOURCE_DIR}/ext/yaml-cpp-${YAML_CPP_VERSION}.tar.gz
BINARY_DIR ext/build/yaml-cpp
......@@ -34,15 +34,15 @@ index 3e36ca5..ba420d4 100644
CMAKE_ARGS ${YAML_CPP_CMAKE_ARGS}
)
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index 0cbfd67..e5354a5 100644
index db42c2f..538b3a7 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -50,7 +50,7 @@ set(SPHINX_VERSION f52b631f501a) # 1.1pre
@@ -55,7 +55,7 @@ set(SPHINX_VERSION 1.2b3)
ExternalProject_Add(Sphinx
DEPENDS setuptools docutils Jinja2 Pygments
URL ${CMAKE_SOURCE_DIR}/ext/sphinx-${SPHINX_VERSION}.tar.gz
- PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/ext/sphinx-${SPHINX_VERSION}.patch
+ PATCH_COMMAND patch -binary -p1 < ${CMAKE_SOURCE_DIR}/ext/sphinx-${SPHINX_VERSION}.patch
URL ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.tar.gz
- PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.patch
+ PATCH_COMMAND patch -binary -p1 < ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.patch
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
BUILD_COMMAND PYTHONPATH=${PYTHONPATH} python setup.py build
BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment