code cleanup: cmake - add missing headers, remove directories from source listing.
authorCampbell Barton <ideasman42@gmail.com>
Sat, 3 Nov 2012 15:49:38 +0000 (15:49 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 3 Nov 2012 15:49:38 +0000 (15:49 +0000)
also remove logImageLib.c - empty file.

CMakeLists.txt
intern/container/CMakeLists.txt
intern/itasc/CMakeLists.txt
source/blender/bmesh/CMakeLists.txt
source/blender/imbuf/CMakeLists.txt
source/blender/imbuf/intern/cineon/CMakeLists.txt
source/blender/imbuf/intern/cineon/logImageLib.c [deleted file]
source/blender/imbuf/intern/dds/CMakeLists.txt
source/blender/imbuf/intern/openexr/CMakeLists.txt
source/gameengine/GamePlayer/CMakeLists.txt
source/tests/CMakeLists.txt

index 5cb6f255d1096e6877178d48a73169e519179413..b53c6f6b71ff9d062e0ea08dc7477b139e28ccee 100644 (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
index 4743247af26bd6cf9142389638c258a437620444..8adc46a59dedc30573dff758c2b81cb7c08983a8 100644 (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!
index 55879e85cdfea2549bfd8cda9b725e152b7f4336..99c64d956cb3412422d251ad9be6f22c3ba135f2 100644 (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
index 291241dc3af3a5a09e8fa5c78cc11fa62b70ad57..d7858ebbc0d04e20f8e9cb4b85aa577ce69da6c5 100644 (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
 
index 511b3c64cb58abb27e481bba15b109d462508ce0..29ed8c95fc60b9a5df3665e1de696e5f651b923f 100644 (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
index 8e76f5e729bd31758e9da9924a5217a9cb7ae82f..b94cfd22058b8857317193fb87dcbd6b69bdceb8 100644 (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
diff --git a/source/blender/imbuf/intern/cineon/logImageLib.c b/source/blender/imbuf/intern/cineon/logImageLib.c
deleted file mode 100644 (file)
index e69de29..0000000
index e0b5a6c10d6cda8aa931ad1003fd79853904c8b7..57603725ce164c714dab05da7504152de0327f2e 100644 (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}")
index a5afc1abdc66816cc21280a2911bde2a0680e827..d5cb8e8a3b6cf7884aa537c670f8296d5db177af 100644 (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}")
index cdf3f826ea996881fff595cc9d36059ba0390326..e1a26668d11bfed378de23ee97a73c38f872e8c9 100644 (file)
@@ -26,6 +26,6 @@
 add_subdirectory(common)
 add_subdirectory(ghost)
 
-if(WITH_WEBPLUGIN) 
+if(WITH_WEBPLUGIN)
        add_subdirectory(xembed)
 endif()
index 070d9adeb34946317a1c76af64781862e2ad1dba..dd84882bea3784f46c8b6a9b957fbd2da224f2b1 100644 (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!")