Skip to content

Instantly share code, notes, and snippets.

@dbr
Created November 29, 2013 01:51
Show Gist options
  • Save dbr/7700532 to your computer and use it in GitHub Desktop.
Save dbr/7700532 to your computer and use it in GitHub Desktop.
diff --git a/src/nuke/CMakeLists.txt b/src/nuke/CMakeLists.txt
index 81b2cd5..91d1a2d 100644
--- a/src/nuke/CMakeLists.txt
+++ b/src/nuke/CMakeLists.txt
@@ -11,7 +11,7 @@ include_directories(
###############################################################################
### NukeOCIOColorSpace ###
-add_library(NukeOCIOColorSpace MODULE
+add_library(NukeOCIOColorSpace SHARED
OCIOColorSpace/OCIOColorSpace.cpp
)
target_link_libraries(NukeOCIOColorSpace
@@ -27,7 +27,7 @@ set_target_properties(NukeOCIOColorSpace
###############################################################################
### NukeOCIODisplay ###
-add_library(NukeOCIODisplay MODULE
+add_library(NukeOCIODisplay SHARED
OCIODisplay/OCIODisplay.cpp
)
target_link_libraries(NukeOCIODisplay
@@ -43,7 +43,7 @@ set_target_properties(NukeOCIODisplay
###############################################################################
### NukeOCIOFileTransform ###
-add_library(NukeOCIOFileTransform MODULE
+add_library(NukeOCIOFileTransform SHARED
OCIOFileTransform/OCIOFileTransform.cpp
)
target_link_libraries(NukeOCIOFileTransform
@@ -59,7 +59,7 @@ set_target_properties(NukeOCIOFileTransform
###############################################################################
### NukeOCIOLogConvert ###
-add_library(NukeOCIOLogConvert MODULE
+add_library(NukeOCIOLogConvert SHARED
OCIOLogConvert/OCIOLogConvert.cpp
)
target_link_libraries(NukeOCIOLogConvert
@@ -75,7 +75,7 @@ set_target_properties(NukeOCIOLogConvert
###############################################################################
### NukeOCIOLookTransform ###
-add_library(NukeOCIOLookTransform MODULE
+add_library(NukeOCIOLookTransform SHARED
OCIOLookTransform/OCIOLookTransform.cpp
)
target_link_libraries(NukeOCIOLookTransform
@@ -91,7 +91,7 @@ set_target_properties(NukeOCIOLookTransform
###############################################################################
### NukeOCIOCDLTransform ###
-add_library(NukeOCIOCDLTransform MODULE
+add_library(NukeOCIOCDLTransform SHARED
OCIOCDLTransform/OCIOCDLTransform.cpp
)
target_link_libraries(NukeOCIOCDLTransform
diff --git a/ext/yaml-cpp-0.3.0.patch b/ext/yaml-cpp-0.3.0.patch
index 0b27de4..ef89b7c 100644
--- a/ext/yaml-cpp-0.3.0.patch
+++ b/ext/yaml-cpp-0.3.0.patch
@@ -1,10 +1,9 @@
-diff -Naur yaml-cpp.orig/CMakeLists.txt yaml-cpp/CMakeLists.txt > yaml-cpp-0.3.0.patch
---- yaml-cpp.orig/CMakeLists.txt 2012-01-21 00:52:48.000000000 -0800
-+++ yaml-cpp/CMakeLists.txt 2013-06-18 16:40:03.209535420 -0700
+--- yaml-cpp-0.3.0.orig/CMakeLists.txt 2012-01-21 19:22:48.000000000 +1030
++++ yaml-cpp-0.3.0/CMakeLists.txt 2013-11-29 11:32:33.632118748 +1030
@@ -235,9 +235,15 @@
${contrib_private_headers}
)
-
+
+set(YAML_COMPILE_FLAGS "-fPIC -fvisibility=hidden")
+if(OCIO_INLINES_HIDDEN)
+ set(YAML_COMPILE_FLAGS "${YAML_COMPILE_FLAGS} -fvisibility-inlines-hidden")
@@ -16,3 +15,12 @@ diff -Naur yaml-cpp.orig/CMakeLists.txt yaml-cpp/CMakeLists.txt > yaml-cpp-0.3.0
+ COMPILE_FLAGS "${YAML_COMPILE_FLAGS}"
PROJECT_LABEL "yaml-cpp ${LABEL_SUFFIX}"
)
+
+@@ -263,7 +269,6 @@
+ install(
+ DIRECTORY ${header_directory}
+ DESTINATION ${INCLUDE_INSTALL_DIR}
+- FILES_MATCHING PATTERN "*.h"
+ )
+
+ if(UNIX)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment