From ff014a30778fb685845e8fc832e3791dba004e68 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 3 Nov 2012 15:49:38 +0000
Subject: code cleanup: cmake - add missing headers, remove directories from
 source listing.

also remove logImageLib.c - empty file.
---
 source/blender/bmesh/CMakeLists.txt                |  4 +++-
 source/blender/imbuf/CMakeLists.txt                | 15 ---------------
 source/blender/imbuf/intern/cineon/CMakeLists.txt  |  9 +++++++++
 source/blender/imbuf/intern/cineon/logImageLib.c   |  0
 source/blender/imbuf/intern/dds/CMakeLists.txt     | 15 +++++++++++++--
 source/blender/imbuf/intern/openexr/CMakeLists.txt |  5 ++++-
 source/gameengine/GamePlayer/CMakeLists.txt        |  2 +-
 source/tests/CMakeLists.txt                        |  2 +-
 8 files changed, 31 insertions(+), 21 deletions(-)
 delete mode 100644 source/blender/imbuf/intern/cineon/logImageLib.c

(limited to 'source')

diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt
index 291241dc3af..d7858ebbc0d 100644
--- a/source/blender/bmesh/CMakeLists.txt
+++ b/source/blender/bmesh/CMakeLists.txt
@@ -30,7 +30,9 @@ set(INC
 	../blenlib
 	../makesdna
 	../../../intern/guardedalloc
-	../../../extern/bullet2/src	../../../intern/opennl/extern)
+	../../../extern/bullet2/src
+	../../../intern/opennl/extern
+)
 
 set(INC_SYS
 
diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt
index 511b3c64cb5..29ed8c95fc6 100644
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -81,21 +81,6 @@ set(SRC
 	intern/IMB_indexer.h
 	intern/IMB_metadata.h
 	intern/imbuf.h
-	intern/cineon/cineonlib.h
-	intern/cineon/dpxlib.h
-	intern/cineon/logImageCore.h
-	intern/cineon/logmemfile.h
-	intern/dds/BlockDXT.h
-	intern/dds/Color.h
-	intern/dds/ColorBlock.h
-	intern/dds/Common.h
-	intern/dds/DirectDrawSurface.h
-	intern/dds/Image.h
-	intern/dds/PixelFormat.h
-	intern/dds/Stream.h
-	intern/dds/dds_api.h
-	intern/openexr/openexr_api.h
-	intern/openexr/openexr_multi.h
 	
 	# orphan include
 	../../../intern/ffmpeg/ffmpeg_compat.h
diff --git a/source/blender/imbuf/intern/cineon/CMakeLists.txt b/source/blender/imbuf/intern/cineon/CMakeLists.txt
index 8e76f5e729b..b94cfd22058 100644
--- a/source/blender/imbuf/intern/cineon/CMakeLists.txt
+++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt
@@ -39,6 +39,15 @@ set(INC_SYS
 )
 
 set(SRC
+	cin_debug_stuff.h
+	cineonfile.h
+	cineonlib.h
+	dpxfile.h
+	dpxlib.h
+	logImageCore.h
+	logImageLib.h
+	logmemfile.h
+
 	cineon_dpx.c
 	cineonlib.c
 	dpxlib.c
diff --git a/source/blender/imbuf/intern/cineon/logImageLib.c b/source/blender/imbuf/intern/cineon/logImageLib.c
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/source/blender/imbuf/intern/dds/CMakeLists.txt b/source/blender/imbuf/intern/dds/CMakeLists.txt
index e0b5a6c10d6..57603725ce1 100644
--- a/source/blender/imbuf/intern/dds/CMakeLists.txt
+++ b/source/blender/imbuf/intern/dds/CMakeLists.txt
@@ -39,10 +39,21 @@ set(INC_SYS
 )
 
 set(SRC
+	BlockDXT.h
+	Color.h
+	ColorBlock.h
+	Common.h
+	DirectDrawSurface.h
+	FlipDXT.h
+	Image.h
+	PixelFormat.h
+	Stream.h
+	dds_api.h
+
 	BlockDXT.cpp
-	FlipDXT.cpp
 	ColorBlock.cpp
 	DirectDrawSurface.cpp
+	FlipDXT.cpp
 	Image.cpp
 	Stream.cpp
 	dds_api.cpp
@@ -52,4 +63,4 @@ if(WITH_IMAGE_DDS)
 	add_definitions(-DWITH_DDS)
 endif()
 
-blender_add_lib(bf_imbuf_dds "${SRC}" "${INC}" "${INC_SYS}")                 
+blender_add_lib(bf_imbuf_dds "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/imbuf/intern/openexr/CMakeLists.txt b/source/blender/imbuf/intern/openexr/CMakeLists.txt
index a5afc1abdc6..d5cb8e8a3b6 100644
--- a/source/blender/imbuf/intern/openexr/CMakeLists.txt
+++ b/source/blender/imbuf/intern/openexr/CMakeLists.txt
@@ -39,6 +39,9 @@ set(INC_SYS
 )
 
 set(SRC
+	openexr_api.h
+	openexr_multi.h
+
 	openexr_api.cpp
 )
 
@@ -49,4 +52,4 @@ if(WITH_IMAGE_OPENEXR)
 	add_definitions(-DWITH_OPENEXR)
 endif()
 
-blender_add_lib(bf_imbuf_openexr "${SRC}" "${INC}" "${INC_SYS}")                 
+blender_add_lib(bf_imbuf_openexr "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/gameengine/GamePlayer/CMakeLists.txt b/source/gameengine/GamePlayer/CMakeLists.txt
index cdf3f826ea9..e1a26668d11 100644
--- a/source/gameengine/GamePlayer/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/CMakeLists.txt
@@ -26,6 +26,6 @@
 add_subdirectory(common)
 add_subdirectory(ghost)
 
-if(WITH_WEBPLUGIN) 
+if(WITH_WEBPLUGIN)
 	add_subdirectory(xembed)
 endif()
diff --git a/source/tests/CMakeLists.txt b/source/tests/CMakeLists.txt
index 070d9adeb34..dd84882bea3 100644
--- a/source/tests/CMakeLists.txt
+++ b/source/tests/CMakeLists.txt
@@ -27,7 +27,7 @@ set(TEST_SRC_DIR ${CMAKE_SOURCE_DIR}/../lib/tests)
 set(TEST_OUT_DIR ${CMAKE_BINARY_DIR}/tests)
 
 # ugh, any better way to do this on testing only?
-execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${TEST_OUT_DIR}) 
+execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${TEST_OUT_DIR})
 
 #~	if(NOT IS_DIRECTORY ${TEST_SRC_DIR})
 #~		message(FATAL_ERROR "CMake test directory not found!")
-- 
cgit v1.2.3