build_environment: opencolorio 1.1.0

-Moved from dynamic link to static on windows
-gained lcms/tinyxml/yamlcpp deps, since we need a little more control over the build flags than the build-in options will provide.

3 files changed, 136 insertions, 0 deletions

diff --git a/build_files/build_environment/patches/cmakelists_lcms.txt b/build_files/build_environment/patches/cmakelists_lcms.txt
new file mode 100644
index 00000000000..cd7b45621ec
--- /dev/null
+++ b/build_files/build_environment/patches/cmakelists_lcms.txt
@@ -0,0 +1,51 @@
+project(lcms2)
+
+cmake_minimum_required(VERSION 2.8)
+
+include_directories(include)
+
+set(HEADERS
+	include/lcms2.h
+	include/lcms2_plugin.h
+)
+set(SOURCES
+    src/cmscam02.c
+    src/cmscgats.c
+    src/cmscnvrt.c
+    src/cmserr.c
+    src/cmsgamma.c
+    src/cmsgmt.c
+    src/cmsintrp.c
+    src/cmsio0.c
+    src/cmsio1.c
+    src/cmslut.c
+    src/cmsmd5.c
+    src/cmsmtrx.c
+    src/cmsnamed.c
+    src/cmsopt.c
+    src/cmspack.c
+    src/cmspcs.c
+    src/cmsplugin.c
+    src/cmsps2.c
+    src/cmssamp.c
+    src/cmssm.c
+    src/cmstypes.c
+    src/cmsvirt.c
+    src/cmswtpnt.c
+    src/cmsxform.c
+    src/lcms2_internal.h
+)
+
+add_library(${PROJECT_NAME} STATIC ${HEADERS} ${SOURCES})
+
+set_target_properties(${PROJECT_NAME} PROPERTIES
+	LIBRARY_OUTPUT_NAME "${PROJECT_NAME}"
+	PUBLIC_HEADER 		"${HEADERS}"
+)
+
+install(TARGETS 		${PROJECT_NAME}
+		RUNTIME         DESTINATION		bin
+        LIBRARY         DESTINATION     lib
+        ARCHIVE         DESTINATION     lib
+        PUBLIC_HEADER	DESTINATION     include
+)
diff --git a/build_files/build_environment/patches/opencolorio_win.diff b/build_files/build_environment/patches/opencolorio_win.diff
new file mode 100644
index 00000000000..eb65411b61a
--- /dev/null
+++ b/build_files/build_environment/patches/opencolorio_win.diff
@@ -0,0 +1,51 @@
+diff -Naur external_opencolorio/CMakeLists.txt external_opencolorio.patched/CMakeLists.txt
+--- external_opencolorio/CMakeLists.txt	2018-01-04 18:38:27 -0700
++++ external_opencolorio.patched/CMakeLists.txt	2018-08-15 11:46:53 -0600
+@@ -251,25 +251,30 @@
+ if(USE_EXTERNAL_YAML)
+     # Set minimum yaml version for non-patched sources.
+     set(YAML_VERSION_MIN "0.3.0")
+-    include(FindPkgConfig)
+-    pkg_check_modules(PC_YAML_CPP REQUIRED QUIET yaml-cpp)
+-    find_path(YAML_CPP_INCLUDE_DIR yaml-cpp/yaml.h
+-        HINTS  ${PC_YAML_CPP_INCLUDEDIR} ${PC_YAML_CPP_INCLUDE_DIRS} )
+-    find_library(YAML_CPP_LIBRARY LIBRARY_NAMES yaml-cpp libyaml-cpp
+-        HINTS ${PC_YAML_CPP_LIBRARY_DIRS} )
+-    set(YAML_CPP_LIBRARIES ${YAML_CPP_LIBRARY})
+-    set(YAML_CPP_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR})
+-    set(YAML_CPP_VERSION ${PC_YAML_CPP_VERSION})
++    if(NOT WIN32)
++		include(FindPkgConfig)
++		pkg_check_modules(PC_YAML_CPP REQUIRED QUIET yaml-cpp)
++		find_path(YAML_CPP_INCLUDE_DIR yaml-cpp/yaml.h
++			HINTS  ${PC_YAML_CPP_INCLUDEDIR} ${PC_YAML_CPP_INCLUDE_DIRS} )
++		find_library(YAML_CPP_LIBRARY LIBRARY_NAMES yaml-cpp libyaml-cpp
++			HINTS ${PC_YAML_CPP_LIBRARY_DIRS} )
++		set(YAML_CPP_LIBRARIES ${YAML_CPP_LIBRARY})
++		set(YAML_CPP_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR})
++		set(YAML_CPP_VERSION ${PC_YAML_CPP_VERSION})
+ 
+-    if(YAML_CPP_VERSION VERSION_LESS ${YAML_VERSION_MIN})
+-        message(FATAL_ERROR "ERROR: yaml-cpp ${YAML_VERSION_MIN} or greater is required.")
+-    endif()
+-
+-    find_package_handle_standard_args(yaml-cpp
+-                                      REQUIRED_VARS YAML_CPP_LIBRARIES YAML_CPP_INCLUDE_DIRS )
+-    set(YAML_CPP_FOUND ${YAML-CPP_FOUND})
+-    mark_as_advanced(YAML_CPP_INCLUDE_DIR YAML_CPP_LIBRARY YAML-CPP_FOUND)
++		if(YAML_CPP_VERSION VERSION_LESS ${YAML_VERSION_MIN})
++			message(FATAL_ERROR "ERROR: yaml-cpp ${YAML_VERSION_MIN} or greater is required.")
++		endif()
+ 
++		find_package_handle_standard_args(yaml-cpp
++										  REQUIRED_VARS YAML_CPP_LIBRARIES YAML_CPP_INCLUDE_DIRS )
++		set(YAML_CPP_FOUND ${YAML-CPP_FOUND})
++		mark_as_advanced(YAML_CPP_INCLUDE_DIR YAML_CPP_LIBRARY YAML-CPP_FOUND)
++	else()
++		set(EXTERNAL_INCLUDE_DIRS ${EXTERNAL_INCLUDE_DIRS} ${INC_1})
++		set(EXTERNAL_INCLUDE_DIRS ${EXTERNAL_INCLUDE_DIRS} ${INC_2})
++		message("INCLUDE DIRS = i:${EXTERNAL_INCLUDE_DIRS} |1:${INC_1} |2:${INC_2}")
++	endif()
+     if(YAML_CPP_FOUND)
+         if(YAML_CPP_VERSION VERSION_GREATER "0.5.0")
+             # Need to also get the boost headers here, as yaml-cpp 0.5.0+ requires them.
diff --git a/build_files/build_environment/patches/tinyxml.diff b/build_files/build_environment/patches/tinyxml.diff
new file mode 100644
index 00000000000..9965f3e610e
--- /dev/null
+++ b/build_files/build_environment/patches/tinyxml.diff
@@ -0,0 +1,34 @@
+diff -Naur tinyxml.orig/CMakeLists.txt tinyxml/CMakeLists.txt
+--- tinyxml.orig/CMakeLists.txt	1969-12-31 16:00:00.000000000 -0800
++++ tinyxml/CMakeLists.txt	2013-06-18 17:10:59.000000000 -0700
+@@ -0,0 +1,30 @@
++project(tinyxml)
++
++cmake_minimum_required(VERSION 2.8)
++
++add_library(tinyxml
++    STATIC
++    tinystr.cpp
++    tinyxml.cpp
++    tinyxmlerror.cpp
++    tinyxmlparser.cpp)
++
++set(TINYXML_COMPILE_FLAGS "-DTIXML_USE_STL")
++
++if(UNIX)
++    set(TINYXML_COMPILE_FLAGS "${TINYXML_COMPILE_FLAGS} -fPIC -fvisibility=hidden")
++endif()
++
++if(OCIO_INLINES_HIDDEN AND UNIX)
++    set(TINYXML_COMPILE_FLAGS "${TINYXML_COMPILE_FLAGS} -fvisibility-inlines-hidden")
++endif()
++
++set_target_properties(tinyxml PROPERTIES
++    COMPILE_FLAGS "${TINYXML_COMPILE_FLAGS}")
++
++install(TARGETS
++    tinyxml
++    DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
++install(FILES
++    tinyxml.h tinystr.h
++    DESTINATION ${CMAKE_INSTALL_PREFIX}/include)