diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-11-03 19:49:38 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-11-03 19:49:38 +0400 |
commit | ff014a30778fb685845e8fc832e3791dba004e68 (patch) | |
tree | 1e976ee812559ace702b3db95a2110a0d9927a73 | |
parent | 9db3f2368cb933002a48291c69170922eeb0256d (diff) |
code cleanup: cmake - add missing headers, remove directories from source listing.
also remove logImageLib.c - empty file.
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | intern/container/CMakeLists.txt | 2 | ||||
-rw-r--r-- | intern/itasc/CMakeLists.txt | 10 | ||||
-rw-r--r-- | source/blender/bmesh/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/imbuf/CMakeLists.txt | 15 | ||||
-rw-r--r-- | source/blender/imbuf/intern/cineon/CMakeLists.txt | 9 | ||||
-rw-r--r-- | source/blender/imbuf/intern/cineon/logImageLib.c | 0 | ||||
-rw-r--r-- | source/blender/imbuf/intern/dds/CMakeLists.txt | 15 | ||||
-rw-r--r-- | source/blender/imbuf/intern/openexr/CMakeLists.txt | 5 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/tests/CMakeLists.txt | 2 |
11 files changed, 34 insertions, 32 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5cb6f255d10..b53c6f6b71f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/intern/container/CMakeLists.txt b/intern/container/CMakeLists.txt index 4743247af26..8adc46a59de 100644 --- a/intern/container/CMakeLists.txt +++ b/intern/container/CMakeLists.txt @@ -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! diff --git a/intern/itasc/CMakeLists.txt b/intern/itasc/CMakeLists.txt index 55879e85cdf..99c64d956cb 100644 --- a/intern/itasc/CMakeLists.txt +++ b/intern/itasc/CMakeLists.txt @@ -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 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 --- a/source/blender/imbuf/intern/cineon/logImageLib.c +++ /dev/null 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!") |