[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51843] trunk/blender: code cleanup: cmake - add missing headers, remove directories from source listing.
Campbell Barton
ideasman42 at gmail.com
Sat Nov 3 16:49:39 CET 2012
Revision: 51843
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51843
Author: campbellbarton
Date: 2012-11-03 15:49:38 +0000 (Sat, 03 Nov 2012)
Log Message:
-----------
code cleanup: cmake - add missing headers, remove directories from source listing.
also remove logImageLib.c - empty file.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/intern/container/CMakeLists.txt
trunk/blender/intern/itasc/CMakeLists.txt
trunk/blender/source/blender/bmesh/CMakeLists.txt
trunk/blender/source/blender/imbuf/CMakeLists.txt
trunk/blender/source/blender/imbuf/intern/cineon/CMakeLists.txt
trunk/blender/source/blender/imbuf/intern/dds/CMakeLists.txt
trunk/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt
trunk/blender/source/gameengine/GamePlayer/CMakeLists.txt
trunk/blender/source/tests/CMakeLists.txt
Removed Paths:
-------------
trunk/blender/source/blender/imbuf/intern/cineon/logImageLib.c
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2012-11-03 15:36:02 UTC (rev 51842)
+++ trunk/blender/CMakeLists.txt 2012-11-03 15:49:38 UTC (rev 51843)
@@ -824,7 +824,7 @@
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
Modified: trunk/blender/intern/container/CMakeLists.txt
===================================================================
--- trunk/blender/intern/container/CMakeLists.txt 2012-11-03 15:36:02 UTC (rev 51842)
+++ trunk/blender/intern/container/CMakeLists.txt 2012-11-03 15:49:38 UTC (rev 51843)
@@ -35,6 +35,8 @@
set(SRC
CTR_HashedPtr.h
CTR_Map.h
+ CTR_TaggedIndex.h
+ CTR_TaggedSetOps.h
)
# infact nothing to compile!
Modified: trunk/blender/intern/itasc/CMakeLists.txt
===================================================================
--- trunk/blender/intern/itasc/CMakeLists.txt 2012-11-03 15:36:02 UTC (rev 51842)
+++ trunk/blender/intern/itasc/CMakeLists.txt 2012-11-03 15:49:38 UTC (rev 51843)
@@ -125,7 +125,6 @@
../../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 @@
../../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 @@
../../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 @@
../../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 @@
../../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 @@
../../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
Modified: trunk/blender/source/blender/bmesh/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/bmesh/CMakeLists.txt 2012-11-03 15:36:02 UTC (rev 51842)
+++ trunk/blender/source/blender/bmesh/CMakeLists.txt 2012-11-03 15:49:38 UTC (rev 51843)
@@ -30,7 +30,9 @@
../blenlib
../makesdna
../../../intern/guardedalloc
- ../../../extern/bullet2/src ../../../intern/opennl/extern)
+ ../../../extern/bullet2/src
+ ../../../intern/opennl/extern
+)
set(INC_SYS
Modified: trunk/blender/source/blender/imbuf/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/imbuf/CMakeLists.txt 2012-11-03 15:36:02 UTC (rev 51842)
+++ trunk/blender/source/blender/imbuf/CMakeLists.txt 2012-11-03 15:49:38 UTC (rev 51843)
@@ -81,21 +81,6 @@
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
Modified: trunk/blender/source/blender/imbuf/intern/cineon/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/imbuf/intern/cineon/CMakeLists.txt 2012-11-03 15:36:02 UTC (rev 51842)
+++ trunk/blender/source/blender/imbuf/intern/cineon/CMakeLists.txt 2012-11-03 15:49:38 UTC (rev 51843)
@@ -39,6 +39,15 @@
)
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
Deleted: trunk/blender/source/blender/imbuf/intern/cineon/logImageLib.c
===================================================================
Modified: trunk/blender/source/blender/imbuf/intern/dds/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/imbuf/intern/dds/CMakeLists.txt 2012-11-03 15:36:02 UTC (rev 51842)
+++ trunk/blender/source/blender/imbuf/intern/dds/CMakeLists.txt 2012-11-03 15:49:38 UTC (rev 51843)
@@ -39,10 +39,21 @@
)
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 @@
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}")
Modified: trunk/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt 2012-11-03 15:36:02 UTC (rev 51842)
+++ trunk/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt 2012-11-03 15:49:38 UTC (rev 51843)
@@ -39,6 +39,9 @@
)
set(SRC
+ openexr_api.h
+ openexr_multi.h
+
openexr_api.cpp
)
@@ -49,4 +52,4 @@
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}")
Modified: trunk/blender/source/gameengine/GamePlayer/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/CMakeLists.txt 2012-11-03 15:36:02 UTC (rev 51842)
+++ trunk/blender/source/gameengine/GamePlayer/CMakeLists.txt 2012-11-03 15:49:38 UTC (rev 51843)
@@ -26,6 +26,6 @@
add_subdirectory(common)
add_subdirectory(ghost)
-if(WITH_WEBPLUGIN)
+if(WITH_WEBPLUGIN)
add_subdirectory(xembed)
endif()
Modified: trunk/blender/source/tests/CMakeLists.txt
===================================================================
--- trunk/blender/source/tests/CMakeLists.txt 2012-11-03 15:36:02 UTC (rev 51842)
+++ trunk/blender/source/tests/CMakeLists.txt 2012-11-03 15:49:38 UTC (rev 51843)
@@ -27,7 +27,7 @@
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!")
More information about the Bf-blender-cvs
mailing list