From 90cd0a37a9c84964dd0daac3f553800e529fae29 Mon Sep 17 00:00:00 2001
From: Irie Shinsuke <irieshinsuke@yahoo.co.jp>
Date: Fri, 11 Oct 2013 23:14:01 +0000
Subject: Fix build scripts related to PSD support.  Both CMake and SCons
 builds were broken.

---
 source/blender/CMakeLists.txt                     | 2 +-
 source/blender/blenkernel/SConscript              | 2 +-
 source/blender/editors/space_file/CMakeLists.txt  | 2 +-
 source/blender/editors/space_image/CMakeLists.txt | 2 +-
 source/blender/imbuf/CMakeLists.txt               | 2 +-
 source/blender/imbuf/intern/oiio/CMakeLists.txt   | 2 +-
 source/blender/makesrna/SConscript                | 2 +-
 source/blender/makesrna/intern/CMakeLists.txt     | 2 +-
 source/blender/python/intern/CMakeLists.txt       | 4 ++--
 9 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index 307f93dd606..dd0583ef01f 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -117,7 +117,7 @@ if(WITH_IMAGE_OPENEXR)
 	add_subdirectory(imbuf/intern/openexr)
 endif()
 
-if(WITH_IMAGE_PSD)
+if(WITH_IMAGE_OPENIMAGEIO)
 	add_subdirectory(imbuf/intern/oiio)
 endif()
 
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index 3754c15ffa8..07dbc1d6065 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -102,7 +102,7 @@ if env['WITH_BF_SDL']:
     defs.append('WITH_SDL')
 
 if env['WITH_BF_OIIO']:
-    defs.append('WITH_OIIO')
+    defs.append('WITH_OPENIMAGEIO')
 
 if env['WITH_BF_OPENEXR']:
     defs.append('WITH_OPENEXR')
diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt
index ccf8576d621..ce0b08c6708 100644
--- a/source/blender/editors/space_file/CMakeLists.txt
+++ b/source/blender/editors/space_file/CMakeLists.txt
@@ -58,7 +58,7 @@ if(WITH_IMAGE_OPENEXR)
 	add_definitions(-DWITH_OPENEXR)
 endif()
 
-if(WITH_OPENIMAGEIO)
+if(WITH_IMAGE_OPENIMAGEIO)
 		add_definitions(-DWITH_OPENIMAGEIO)
 endif()
 
diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt
index 50d8051a73e..2f78818d012 100644
--- a/source/blender/editors/space_image/CMakeLists.txt
+++ b/source/blender/editors/space_image/CMakeLists.txt
@@ -50,7 +50,7 @@ if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()
 
-if(WITH_OPENIMAGEIO)
+if(WITH_IMAGE_OPENIMAGEIO)
 	add_definitions(-DWITH_OPENIMAGEIO)
 endif()
 
diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt
index 4025a41b6a7..26cf19fc158 100644
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -106,7 +106,7 @@ if(WITH_IMAGE_TIFF)
 endif()
 
 
-if(WITH_OPENIMAGEIO)
+if(WITH_IMAGE_OPENIMAGEIO)
 	add_definitions(-DWITH_OPENIMAGEIO)
 endif()
 
diff --git a/source/blender/imbuf/intern/oiio/CMakeLists.txt b/source/blender/imbuf/intern/oiio/CMakeLists.txt
index 5fb8f11602e..271a2bc3268 100644
--- a/source/blender/imbuf/intern/oiio/CMakeLists.txt
+++ b/source/blender/imbuf/intern/oiio/CMakeLists.txt
@@ -44,7 +44,7 @@ set(SRC
 	openimageio_api.cpp
 )
 
-if(WITH_OPENIMAGEIO)
+if(WITH_IMAGE_OPENIMAGEIO)
 	list(APPEND INC_SYS
 		${OPENIMAGEIO_INCLUDE_DIRS}
 	)
diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript
index 9026b166311..5053c8082e9 100644
--- a/source/blender/makesrna/SConscript
+++ b/source/blender/makesrna/SConscript
@@ -67,7 +67,7 @@ if env['WITH_BF_BULLET']:
     incs += ' #/intern/rigidbody'
 
 if env['WITH_BF_OIIO']:
-    defs.append('WITH_OIIO')
+    defs.append('WITH_OPENIMAGEIO')
 
 if env['WITH_BF_OPENEXR']:
     defs.append('WITH_OPENEXR')
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 674b41dfa45..bac335572f5 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -166,7 +166,7 @@ if(WITH_IMAGE_OPENEXR)
 	add_definitions(-DWITH_OPENEXR)
 endif()
 
-if(WITH_OPENIMAGEIO)
+if(WITH_IMAGE_OPENIMAGEIO)
 		add_definitions(-DWITH_OPENIMAGEIO)
 endif()
 
diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt
index 0f12619a1c0..4b2b86ab6c4 100644
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -174,8 +174,8 @@ if(WITH_IMAGE_OPENEXR)
 	add_definitions(-DWITH_OPENEXR)
 endif()
 
-if(WITH_OPENIMAGEIO)
-		add_definitions(-DWITH_OPENIMAGEIO)
+if(WITH_IMAGE_OPENIMAGEIO)
+	add_definitions(-DWITH_OPENIMAGEIO)
 endif()
 
 if(WITH_IMAGE_OPENJPEG)
-- 
cgit v1.2.3