code cleanup: cmake - add missing headers, remove directories from source listing.

also remove logImageLib.c - empty file.
This commit is contained in:
Campbell Barton
2012-11-03 15:49:38 +00:00
parent 9db3f2368c
commit ff014a3077
11 changed files with 34 additions and 32 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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}")

View File

@@ -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}")

View File

@@ -26,6 +26,6 @@
add_subdirectory(common)
add_subdirectory(ghost)
if(WITH_WEBPLUGIN)
if(WITH_WEBPLUGIN)
add_subdirectory(xembed)
endif()

View File

@@ -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!")