Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -824,7 +824,7 @@ if(UNIX AND NOT APPLE)
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
# Solaris CC
elseif(CMAKE_CXX_COMPILER_ID MATCHES "SunPro")
elseif(CMAKE_CXX_COMPILER_ID MATCHES "SunPro")
set(PLATFORM_CFLAGS "-pipe -features=extensions -fPIC -D__FUNCTION__=__func__")
# Intel C++ Compiler

2
intern/container/CMakeLists.txt
View File

@@ -35,6 +35,8 @@ set(INC_SYS
set(SRC
CTR_HashedPtr.h
CTR_Map.h
CTR_TaggedIndex.h
CTR_TaggedSetOps.h
)
# infact nothing to compile!

10
intern/itasc/CMakeLists.txt
View File

@@ -125,7 +125,6 @@ set(SRC
../../extern/Eigen3/Eigen/src/Cholesky/LLT.h
../../extern/Eigen3/Eigen/src/Cholesky/LLT_MKL.h
../../extern/Eigen3/Eigen/src/CholmodSupport/CholmodSupport.h
../../extern/Eigen3/Eigen/src/Core/arch
../../extern/Eigen3/Eigen/src/Core/Array.h
../../extern/Eigen3/Eigen/src/Core/ArrayBase.h
../../extern/Eigen3/Eigen/src/Core/ArrayWrapper.h
@@ -167,7 +166,6 @@ set(SRC
../../extern/Eigen3/Eigen/src/Core/PlainObjectBase.h
../../extern/Eigen3/Eigen/src/Core/Product.h
../../extern/Eigen3/Eigen/src/Core/ProductBase.h
../../extern/Eigen3/Eigen/src/Core/products
../../extern/Eigen3/Eigen/src/Core/Random.h
../../extern/Eigen3/Eigen/src/Core/Redux.h
../../extern/Eigen3/Eigen/src/Core/Replicate.h
@@ -183,14 +181,9 @@ set(SRC
../../extern/Eigen3/Eigen/src/Core/Transpose.h
../../extern/Eigen3/Eigen/src/Core/Transpositions.h
../../extern/Eigen3/Eigen/src/Core/TriangularMatrix.h
../../extern/Eigen3/Eigen/src/Core/util
../../extern/Eigen3/Eigen/src/Core/VectorBlock.h
../../extern/Eigen3/Eigen/src/Core/VectorwiseOp.h
../../extern/Eigen3/Eigen/src/Core/Visitor.h
../../extern/Eigen3/Eigen/src/Core/arch/AltiVec
../../extern/Eigen3/Eigen/src/Core/arch/Default
../../extern/Eigen3/Eigen/src/Core/arch/NEON
../../extern/Eigen3/Eigen/src/Core/arch/SSE
../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/Complex.h
../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h
../../extern/Eigen3/Eigen/src/Core/arch/Default/Settings.h
@@ -236,7 +229,6 @@ set(SRC
../../extern/Eigen3/Eigen/src/Eigen2Support/Block.h
../../extern/Eigen3/Eigen/src/Eigen2Support/Cwise.h
../../extern/Eigen3/Eigen/src/Eigen2Support/CwiseOperators.h
../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry
../../extern/Eigen3/Eigen/src/Eigen2Support/Lazy.h
../../extern/Eigen3/Eigen/src/Eigen2Support/LeastSquares.h
../../extern/Eigen3/Eigen/src/Eigen2Support/LU.h
@@ -274,7 +266,6 @@ set(SRC
../../extern/Eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h
../../extern/Eigen3/Eigen/src/Geometry/AlignedBox.h
../../extern/Eigen3/Eigen/src/Geometry/AngleAxis.h
../../extern/Eigen3/Eigen/src/Geometry/arch
../../extern/Eigen3/Eigen/src/Geometry/EulerAngles.h
../../extern/Eigen3/Eigen/src/Geometry/Homogeneous.h
../../extern/Eigen3/Eigen/src/Geometry/Hyperplane.h
@@ -297,7 +288,6 @@ set(SRC
../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/IncompleteLUT.h
../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/IterativeSolverBase.h
../../extern/Eigen3/Eigen/src/Jacobi/Jacobi.h
../../extern/Eigen3/Eigen/src/LU/arch
../../extern/Eigen3/Eigen/src/LU/Determinant.h
../../extern/Eigen3/Eigen/src/LU/FullPivLU.h
../../extern/Eigen3/Eigen/src/LU/Inverse.h

4
source/blender/bmesh/CMakeLists.txt
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

15
source/blender/imbuf/CMakeLists.txt
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

9
source/blender/imbuf/intern/cineon/CMakeLists.txt
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

0
source/blender/imbuf/intern/cineon/logImageLib.c
View File

15
source/blender/imbuf/intern/dds/CMakeLists.txt
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}")

5
source/blender/imbuf/intern/openexr/CMakeLists.txt
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}")

2
source/gameengine/GamePlayer/CMakeLists.txt
View File

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

2
source/tests/CMakeLists.txt
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!")