[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31545] trunk/blender: rename some cmake build targets
Campbell Barton
ideasman42 at gmail.com
Tue Aug 24 06:29:24 CEST 2010
Revision: 31545
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31545
Author: campbellbarton
Date: 2010-08-24 06:29:23 +0200 (Tue, 24 Aug 2010)
Log Message:
-----------
rename some cmake build targets
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/extern/libopenjpeg/CMakeLists.txt
trunk/blender/extern/lzma/CMakeLists.txt
trunk/blender/extern/lzo/CMakeLists.txt
trunk/blender/intern/audaspace/CMakeLists.txt
trunk/blender/intern/boolop/CMakeLists.txt
trunk/blender/intern/bsp/CMakeLists.txt
trunk/blender/intern/container/CMakeLists.txt
trunk/blender/intern/decimation/CMakeLists.txt
trunk/blender/intern/elbeem/CMakeLists.txt
trunk/blender/intern/ghost/CMakeLists.txt
trunk/blender/intern/guardedalloc/CMakeLists.txt
trunk/blender/intern/iksolver/CMakeLists.txt
trunk/blender/intern/itasc/CMakeLists.txt
trunk/blender/intern/memutil/CMakeLists.txt
trunk/blender/intern/moto/CMakeLists.txt
trunk/blender/intern/opennl/CMakeLists.txt
trunk/blender/intern/smoke/CMakeLists.txt
trunk/blender/intern/string/CMakeLists.txt
trunk/blender/source/blender/python/generic/CMakeLists.txt
trunk/blender/source/blender/render/CMakeLists.txt
trunk/blender/source/blenderplayer/CMakeLists.txt
trunk/blender/source/creator/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2010-08-24 04:02:50 UTC (rev 31544)
+++ trunk/blender/CMakeLists.txt 2010-08-24 04:29:23 UTC (rev 31545)
@@ -873,7 +873,7 @@
IF(WITH_IMAGE_OPENJPEG)
set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
set(OPENJPEG_INC ${OPENJPEG})
- set(OPENJPEG_LIb extern_libopenjpeg)
+ set(OPENJPEG_LIb extern_openjpeg)
ENDIF(WITH_IMAGE_OPENJPEG)
#-----------------------------------------------------------------------------
Modified: trunk/blender/extern/libopenjpeg/CMakeLists.txt
===================================================================
--- trunk/blender/extern/libopenjpeg/CMakeLists.txt 2010-08-24 04:02:50 UTC (rev 31544)
+++ trunk/blender/extern/libopenjpeg/CMakeLists.txt 2010-08-24 04:29:23 UTC (rev 31545)
@@ -28,5 +28,5 @@
FILE(GLOB SRC *.c except t1_generate_luts.c)
ADD_DEFINITIONS(-DWITH_OPENJPEG)
-BLENDERLIB(extern_libopenjpeg "${SRC}" "${INC}")
+BLENDERLIB(extern_openjpeg "${SRC}" "${INC}")
#, libtype=['international','player'], priority=[5, 210])
Modified: trunk/blender/extern/lzma/CMakeLists.txt
===================================================================
--- trunk/blender/extern/lzma/CMakeLists.txt 2010-08-24 04:02:50 UTC (rev 31544)
+++ trunk/blender/extern/lzma/CMakeLists.txt 2010-08-24 04:29:23 UTC (rev 31545)
@@ -28,7 +28,4 @@
FILE(GLOB SRC ./*.c)
-
-
-BLENDERLIB(bf_lzma "${SRC}" "${INC}")
-#, libtype='blender', priority = 0 )
+BLENDERLIB(extern_lzma "${SRC}" "${INC}")
Modified: trunk/blender/extern/lzo/CMakeLists.txt
===================================================================
--- trunk/blender/extern/lzo/CMakeLists.txt 2010-08-24 04:02:50 UTC (rev 31544)
+++ trunk/blender/extern/lzo/CMakeLists.txt 2010-08-24 04:29:23 UTC (rev 31545)
@@ -30,5 +30,5 @@
-BLENDERLIB(bf_minilzo "${SRC}" "${INC}")
+BLENDERLIB(extern_minilzo "${SRC}" "${INC}")
#, libtype='blender', priority = 0 )
Modified: trunk/blender/intern/audaspace/CMakeLists.txt
===================================================================
--- trunk/blender/intern/audaspace/CMakeLists.txt 2010-08-24 04:02:50 UTC (rev 31544)
+++ trunk/blender/intern/audaspace/CMakeLists.txt 2010-08-24 04:29:23 UTC (rev 31545)
@@ -69,4 +69,4 @@
SET(SRC ${SRC} ${FFMPEGSRC} ${SNDFILESRC} ${FFTW3SRC} ${SDLSRC} ${OPENALSRC} ${JACKSRC} ${PYTHONSRC})
-BLENDERLIB(bf_audaspace "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_audaspace "${SRC}" "${INC}")
Modified: trunk/blender/intern/boolop/CMakeLists.txt
===================================================================
--- trunk/blender/intern/boolop/CMakeLists.txt 2010-08-24 04:02:50 UTC (rev 31544)
+++ trunk/blender/intern/boolop/CMakeLists.txt 2010-08-24 04:29:23 UTC (rev 31545)
@@ -28,5 +28,5 @@
FILE(GLOB SRC intern/*.cpp)
-BLENDERLIB(blender_bop "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_bop "${SRC}" "${INC}")
#, libtype='common', priority=5 )
Modified: trunk/blender/intern/bsp/CMakeLists.txt
===================================================================
--- trunk/blender/intern/bsp/CMakeLists.txt 2010-08-24 04:02:50 UTC (rev 31544)
+++ trunk/blender/intern/bsp/CMakeLists.txt 2010-08-24 04:29:23 UTC (rev 31545)
@@ -28,5 +28,5 @@
FILE(GLOB SRC intern/*.cpp)
-BLENDERLIB(blender_BSP "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_bsp "${SRC}" "${INC}")
#, libtype='core', priority=15 )
Modified: trunk/blender/intern/container/CMakeLists.txt
===================================================================
--- trunk/blender/intern/container/CMakeLists.txt 2010-08-24 04:02:50 UTC (rev 31544)
+++ trunk/blender/intern/container/CMakeLists.txt 2010-08-24 04:29:23 UTC (rev 31545)
@@ -28,5 +28,5 @@
FILE(GLOB SRC intern/*.cpp)
-BLENDERLIB(blender_CTR "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_ctr "${SRC}" "${INC}")
#, libtype=['intern'], priority = 10 )
Modified: trunk/blender/intern/decimation/CMakeLists.txt
===================================================================
--- trunk/blender/intern/decimation/CMakeLists.txt 2010-08-24 04:02:50 UTC (rev 31544)
+++ trunk/blender/intern/decimation/CMakeLists.txt 2010-08-24 04:29:23 UTC (rev 31545)
@@ -28,5 +28,5 @@
FILE(GLOB SRC intern/*.cpp)
-BLENDERLIB(bf_decimation "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_decimate "${SRC}" "${INC}")
#, libtype=['core','common','player'], priority = [10, 20, 25] )
Modified: trunk/blender/intern/elbeem/CMakeLists.txt
===================================================================
--- trunk/blender/intern/elbeem/CMakeLists.txt 2010-08-24 04:02:50 UTC (rev 31544)
+++ trunk/blender/intern/elbeem/CMakeLists.txt 2010-08-24 04:29:23 UTC (rev 31545)
@@ -37,5 +37,5 @@
ADD_DEFINITIONS(-DPARALLEL=1)
ENDIF(WITH_OPENMP)
-BLENDERLIB_NOLIST(bf_elbeem "${SRC}" "${INC}")
+BLENDERLIB_NOLIST(bf_intern_elbeem "${SRC}" "${INC}")
#, libtype='blender', priority=0 )
Modified: trunk/blender/intern/ghost/CMakeLists.txt
===================================================================
--- trunk/blender/intern/ghost/CMakeLists.txt 2010-08-24 04:02:50 UTC (rev 31544)
+++ trunk/blender/intern/ghost/CMakeLists.txt 2010-08-24 04:29:23 UTC (rev 31545)
@@ -90,5 +90,5 @@
ENDIF(APPLE)
-BLENDERLIB(bf_ghost "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_ghost "${SRC}" "${INC}")
Modified: trunk/blender/intern/guardedalloc/CMakeLists.txt
===================================================================
--- trunk/blender/intern/guardedalloc/CMakeLists.txt 2010-08-24 04:02:50 UTC (rev 31544)
+++ trunk/blender/intern/guardedalloc/CMakeLists.txt 2010-08-24 04:29:23 UTC (rev 31545)
@@ -28,10 +28,10 @@
FILE(GLOB SRC intern/*.c)
-BLENDERLIB(bf_guardedalloc "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_guardedalloc "${SRC}" "${INC}")
# Override C++ alloc optional
IF(WITH_CXX_GUARDEDALLOC)
FILE(GLOB SRC cpp/*.cpp)
- BLENDERLIB(bf_guardedalloc_cpp "${SRC}" "${INC}")
+ BLENDERLIB(bf_intern_guardedalloc_cpp "${SRC}" "${INC}")
ENDIF(WITH_CXX_GUARDEDALLOC)
Modified: trunk/blender/intern/iksolver/CMakeLists.txt
===================================================================
--- trunk/blender/intern/iksolver/CMakeLists.txt 2010-08-24 04:02:50 UTC (rev 31544)
+++ trunk/blender/intern/iksolver/CMakeLists.txt 2010-08-24 04:29:23 UTC (rev 31545)
@@ -28,5 +28,5 @@
FILE(GLOB SRC intern/*.cpp)
-BLENDERLIB(bf_IK "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_ik "${SRC}" "${INC}")
#, libtype=['blender'], priority = [10] )
Modified: trunk/blender/intern/itasc/CMakeLists.txt
===================================================================
--- trunk/blender/intern/itasc/CMakeLists.txt 2010-08-24 04:02:50 UTC (rev 31544)
+++ trunk/blender/intern/itasc/CMakeLists.txt 2010-08-24 04:29:23 UTC (rev 31545)
@@ -28,5 +28,5 @@
FILE(GLOB SRC *.cpp kdl/*.cpp kdl/utilities/*.cpp)
-BLENDERLIB(bf_ITASC "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_itasc "${SRC}" "${INC}")
#, libtype=['blender'], priority = [10] )
Modified: trunk/blender/intern/memutil/CMakeLists.txt
===================================================================
--- trunk/blender/intern/memutil/CMakeLists.txt 2010-08-24 04:02:50 UTC (rev 31544)
+++ trunk/blender/intern/memutil/CMakeLists.txt 2010-08-24 04:29:23 UTC (rev 31545)
@@ -28,5 +28,5 @@
FILE(GLOB SRC intern/*.cpp)
-BLENDERLIB(bf_memutil "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_memutil "${SRC}" "${INC}")
#, libtype=['intern', 'player'], priority = [0, 180] )
Modified: trunk/blender/intern/moto/CMakeLists.txt
===================================================================
--- trunk/blender/intern/moto/CMakeLists.txt 2010-08-24 04:02:50 UTC (rev 31544)
+++ trunk/blender/intern/moto/CMakeLists.txt 2010-08-24 04:29:23 UTC (rev 31545)
@@ -28,5 +28,5 @@
FILE(GLOB SRC intern/*.cpp)
-BLENDERLIB(bf_moto "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_moto "${SRC}" "${INC}")
#, libtype=['intern','game','game2','player'], priority = [15, 55, 100, 135] )
Modified: trunk/blender/intern/opennl/CMakeLists.txt
===================================================================
--- trunk/blender/intern/opennl/CMakeLists.txt 2010-08-24 04:02:50 UTC (rev 31544)
+++ trunk/blender/intern/opennl/CMakeLists.txt 2010-08-24 04:29:23 UTC (rev 31545)
@@ -28,6 +28,6 @@
FILE(GLOB SRC intern/*.c superlu/*.c)
-BLENDERLIB(blender_ONL "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_opennl "${SRC}" "${INC}")
#, libtype='core', priority=55 )
Modified: trunk/blender/intern/smoke/CMakeLists.txt
===================================================================
--- trunk/blender/intern/smoke/CMakeLists.txt 2010-08-24 04:02:50 UTC (rev 31544)
+++ trunk/blender/intern/smoke/CMakeLists.txt 2010-08-24 04:29:23 UTC (rev 31545)
@@ -38,5 +38,5 @@
ENDIF(WITH_FFTW3)
-BLENDERLIB(bf_smoke "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_smoke "${SRC}" "${INC}")
#, libtype='blender', priority = 0 )
Modified: trunk/blender/intern/string/CMakeLists.txt
===================================================================
--- trunk/blender/intern/string/CMakeLists.txt 2010-08-24 04:02:50 UTC (rev 31544)
+++ trunk/blender/intern/string/CMakeLists.txt 2010-08-24 04:29:23 UTC (rev 31545)
@@ -28,5 +28,5 @@
FILE(GLOB SRC intern/*.cpp)
-BLENDERLIB(bf_string "${SRC}" "${INC}")
+BLENDERLIB(bf_intern_string "${SRC}" "${INC}")
#, libtype=['core', 'player'], priority = [30,10] )
Modified: trunk/blender/source/blender/python/generic/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/python/generic/CMakeLists.txt 2010-08-24 04:02:50 UTC (rev 31544)
+++ trunk/blender/source/blender/python/generic/CMakeLists.txt 2010-08-24 04:29:23 UTC (rev 31545)
@@ -31,4 +31,4 @@
${PYTHON_INC}
)
-BLENDERLIB(bf_gen_python "${SRC}" "${INC}")
+BLENDERLIB(bf_python_ext "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/render/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/render/CMakeLists.txt 2010-08-24 04:02:50 UTC (rev 31544)
+++ trunk/blender/source/blender/render/CMakeLists.txt 2010-08-24 04:29:23 UTC (rev 31545)
@@ -54,4 +54,4 @@
ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
ENDIF(APPLE)
-BLENDERLIB_NOLIST(blender_render "${SRC}" "${INC}")
+BLENDERLIB_NOLIST(bf_render "${SRC}" "${INC}")
Modified: trunk/blender/source/blenderplayer/CMakeLists.txt
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list