archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

rename some cmake build targets

Browse Source
This commit is contained in:
Campbell Barton
2010-08-24 04:29:23 +00:00
parent 379fea2d0d
commit 6464718083
23 changed files with 62 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -873,7 +873,7 @@ ENDIF(WITH_RAYOPTIMIZATION)
IF(WITH_IMAGE_OPENJPEG) IF(WITH_IMAGE_OPENJPEG)
set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg) set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
set(OPENJPEG_INC ${OPENJPEG}) set(OPENJPEG_INC ${OPENJPEG})
set(OPENJPEG_LIb extern_libopenjpeg) set(OPENJPEG_LIb extern_openjpeg)
ENDIF(WITH_IMAGE_OPENJPEG) ENDIF(WITH_IMAGE_OPENJPEG)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------

2
extern/libopenjpeg/CMakeLists.txt vendored
View File

@@ -28,5 +28,5 @@ SET(INC . src)
FILE(GLOB SRC *.c except t1_generate_luts.c) FILE(GLOB SRC *.c except t1_generate_luts.c)
ADD_DEFINITIONS(-DWITH_OPENJPEG) ADD_DEFINITIONS(-DWITH_OPENJPEG)
BLENDERLIB(extern_libopenjpeg "${SRC}" "${INC}") BLENDERLIB(extern_openjpeg "${SRC}" "${INC}")
#, libtype=['international','player'], priority=[5, 210]) #, libtype=['international','player'], priority=[5, 210])

5
extern/lzma/CMakeLists.txt vendored
View File

@@ -28,7 +28,4 @@ SET(INC . )
FILE(GLOB SRC ./*.c) FILE(GLOB SRC ./*.c)
BLENDERLIB(extern_lzma "${SRC}" "${INC}")
BLENDERLIB(bf_lzma "${SRC}" "${INC}")
#, libtype='blender', priority = 0 )

2
extern/lzo/CMakeLists.txt vendored
View File

@@ -30,5 +30,5 @@ FILE(GLOB SRC minilzo/*.c)
BLENDERLIB(bf_minilzo "${SRC}" "${INC}") BLENDERLIB(extern_minilzo "${SRC}" "${INC}")
#, libtype='blender', priority = 0 ) #, libtype='blender', priority = 0 )

2
intern/audaspace/CMakeLists.txt
View File

@@ -69,4 +69,4 @@ ENDIF(WITH_PYTHON)
SET(SRC ${SRC} ${FFMPEGSRC} ${SNDFILESRC} ${FFTW3SRC} ${SDLSRC} ${OPENALSRC} ${JACKSRC} ${PYTHONSRC}) SET(SRC ${SRC} ${FFMPEGSRC} ${SNDFILESRC} ${FFTW3SRC} ${SDLSRC} ${OPENALSRC} ${JACKSRC} ${PYTHONSRC})
BLENDERLIB(bf_audaspace "${SRC}" "${INC}") BLENDERLIB(bf_intern_audaspace "${SRC}" "${INC}")

2
intern/boolop/CMakeLists.txt
View File

@@ -28,5 +28,5 @@ SET(INC . intern extern ../moto/include ../container ../memutil ../../source/ble
FILE(GLOB SRC intern/*.cpp) FILE(GLOB SRC intern/*.cpp)
BLENDERLIB(blender_bop "${SRC}" "${INC}") BLENDERLIB(bf_intern_bop "${SRC}" "${INC}")
#, libtype='common', priority=5 ) #, libtype='common', priority=5 )

2
intern/bsp/CMakeLists.txt
View File

@@ -28,5 +28,5 @@ SET(INC intern ../container ../moto/include ../memutil)
FILE(GLOB SRC intern/*.cpp) FILE(GLOB SRC intern/*.cpp)
BLENDERLIB(blender_BSP "${SRC}" "${INC}") BLENDERLIB(bf_intern_bsp "${SRC}" "${INC}")
#, libtype='core', priority=15 ) #, libtype='core', priority=15 )

2
intern/container/CMakeLists.txt
View File

@@ -28,5 +28,5 @@ SET(INC .)
FILE(GLOB SRC intern/*.cpp) FILE(GLOB SRC intern/*.cpp)
BLENDERLIB(blender_CTR "${SRC}" "${INC}") BLENDERLIB(bf_intern_ctr "${SRC}" "${INC}")
#, libtype=['intern'], priority = 10 ) #, libtype=['intern'], priority = 10 )

2
intern/decimation/CMakeLists.txt
View File

@@ -28,5 +28,5 @@ SET(INC . ../moto/include ../container ../memutil)
FILE(GLOB SRC intern/*.cpp) FILE(GLOB SRC intern/*.cpp)
BLENDERLIB(bf_decimation "${SRC}" "${INC}") BLENDERLIB(bf_intern_decimate "${SRC}" "${INC}")
#, libtype=['core','common','player'], priority = [10, 20, 25] ) #, libtype=['core','common','player'], priority = [10, 20, 25] )

2
intern/elbeem/CMakeLists.txt
View File

@@ -37,5 +37,5 @@ IF(WITH_OPENMP)
ADD_DEFINITIONS(-DPARALLEL=1) ADD_DEFINITIONS(-DPARALLEL=1)
ENDIF(WITH_OPENMP) ENDIF(WITH_OPENMP)
BLENDERLIB_NOLIST(bf_elbeem "${SRC}" "${INC}") BLENDERLIB_NOLIST(bf_intern_elbeem "${SRC}" "${INC}")
#, libtype='blender', priority=0 ) #, libtype='blender', priority=0 )

2
intern/ghost/CMakeLists.txt
View File

@@ -90,5 +90,5 @@ ELSEIF(UNIX)
ENDIF(APPLE) ENDIF(APPLE)
BLENDERLIB(bf_ghost "${SRC}" "${INC}") BLENDERLIB(bf_intern_ghost "${SRC}" "${INC}")

4
intern/guardedalloc/CMakeLists.txt
View File

@@ -28,10 +28,10 @@ SET(INC .)
FILE(GLOB SRC intern/*.c) FILE(GLOB SRC intern/*.c)
BLENDERLIB(bf_guardedalloc "${SRC}" "${INC}") BLENDERLIB(bf_intern_guardedalloc "${SRC}" "${INC}")
# Override C++ alloc optional # Override C++ alloc optional
IF(WITH_CXX_GUARDEDALLOC) IF(WITH_CXX_GUARDEDALLOC)
FILE(GLOB SRC cpp/*.cpp) FILE(GLOB SRC cpp/*.cpp)
BLENDERLIB(bf_guardedalloc_cpp "${SRC}" "${INC}") BLENDERLIB(bf_intern_guardedalloc_cpp "${SRC}" "${INC}")
ENDIF(WITH_CXX_GUARDEDALLOC) ENDIF(WITH_CXX_GUARDEDALLOC)

2
intern/iksolver/CMakeLists.txt
View File

@@ -28,5 +28,5 @@ SET(INC intern ../moto/include ../memutil)
FILE(GLOB SRC intern/*.cpp) FILE(GLOB SRC intern/*.cpp)
BLENDERLIB(bf_IK "${SRC}" "${INC}") BLENDERLIB(bf_intern_ik "${SRC}" "${INC}")
#, libtype=['blender'], priority = [10] ) #, libtype=['blender'], priority = [10] )

2
intern/itasc/CMakeLists.txt
View File

@@ -28,5 +28,5 @@ SET(INC ../../extern/Eigen2)
FILE(GLOB SRC *.cpp kdl/*.cpp kdl/utilities/*.cpp) FILE(GLOB SRC *.cpp kdl/*.cpp kdl/utilities/*.cpp)
BLENDERLIB(bf_ITASC "${SRC}" "${INC}") BLENDERLIB(bf_intern_itasc "${SRC}" "${INC}")
#, libtype=['blender'], priority = [10] ) #, libtype=['blender'], priority = [10] )

2
intern/memutil/CMakeLists.txt
View File

@@ -28,5 +28,5 @@ SET(INC . ..)
FILE(GLOB SRC intern/*.cpp) FILE(GLOB SRC intern/*.cpp)
BLENDERLIB(bf_memutil "${SRC}" "${INC}") BLENDERLIB(bf_intern_memutil "${SRC}" "${INC}")
#, libtype=['intern', 'player'], priority = [0, 180] ) #, libtype=['intern', 'player'], priority = [0, 180] )

2
intern/moto/CMakeLists.txt
View File

@@ -28,5 +28,5 @@ SET(INC include)
FILE(GLOB SRC intern/*.cpp) 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] ) #, libtype=['intern','game','game2','player'], priority = [15, 55, 100, 135] )

2
intern/opennl/CMakeLists.txt
View File

@@ -28,6 +28,6 @@ SET(INC extern superlu)
FILE(GLOB SRC intern/*.c superlu/*.c) FILE(GLOB SRC intern/*.c superlu/*.c)
BLENDERLIB(blender_ONL "${SRC}" "${INC}") BLENDERLIB(bf_intern_opennl "${SRC}" "${INC}")
#, libtype='core', priority=55 ) #, libtype='core', priority=55 )

2
intern/smoke/CMakeLists.txt
View File

@@ -38,5 +38,5 @@ IF(WITH_FFTW3)
ENDIF(WITH_FFTW3) ENDIF(WITH_FFTW3)
BLENDERLIB(bf_smoke "${SRC}" "${INC}") BLENDERLIB(bf_intern_smoke "${SRC}" "${INC}")
#, libtype='blender', priority = 0 ) #, libtype='blender', priority = 0 )

2
intern/string/CMakeLists.txt
View File

@@ -28,5 +28,5 @@ SET(INC .)
FILE(GLOB SRC intern/*.cpp) FILE(GLOB SRC intern/*.cpp)
BLENDERLIB(bf_string "${SRC}" "${INC}") BLENDERLIB(bf_intern_string "${SRC}" "${INC}")
#, libtype=['core', 'player'], priority = [30,10] ) #, libtype=['core', 'player'], priority = [30,10] )

2
source/blender/python/generic/CMakeLists.txt
View File

@@ -31,4 +31,4 @@ SET(INC
${PYTHON_INC} ${PYTHON_INC}
) )
BLENDERLIB(bf_gen_python "${SRC}" "${INC}") BLENDERLIB(bf_python_ext "${SRC}" "${INC}")

2
source/blender/render/CMakeLists.txt
View File

@@ -54,4 +54,4 @@ IF(APPLE)
ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64") ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
ENDIF(APPLE) ENDIF(APPLE)
BLENDERLIB_NOLIST(blender_render "${SRC}" "${INC}") BLENDERLIB_NOLIST(bf_render "${SRC}" "${INC}")

24
source/blenderplayer/CMakeLists.txt
View File

@@ -64,8 +64,8 @@ IF(UNIX)
SET(BLENDER_SORTED_LIBS SET(BLENDER_SORTED_LIBS
gp_ghost gp_ghost
gp_common gp_common
bf_string bf_intern_string
bf_ghost bf_intern_ghost
bf_rna bf_rna
bf_blenkernel bf_blenkernel
bf_blenloader bf_blenloader
@@ -82,11 +82,11 @@ IF(UNIX)
bf_expressions bf_expressions
bf_scenegraph bf_scenegraph
bf_ikplugin bf_ikplugin
bf_ITASC bf_intern_itasc
bf_IK bf_intern_ik
bf_smoke bf_intern_smoke
bf_modifiers bf_modifiers
bf_moto bf_intern_moto
bf_kernel bf_kernel
bf_nodes bf_nodes
bf_gpu bf_gpu
@@ -96,20 +96,20 @@ IF(UNIX)
bf_ngnetwork bf_ngnetwork
bf_loopbacknetwork bf_loopbacknetwork
extern_bullet extern_bullet
bf_guardedalloc bf_intern_guardedalloc
bf_memutil bf_intern_memutil
bf_python bf_python
bf_gen_python bf_python_ext
bf_blenlib bf_blenlib
bf_cineon bf_cineon
bf_openexr bf_openexr
extern_libopenjpeg extern_openjpeg
bf_dds bf_dds
bf_readblenfile bf_readblenfile
bf_dna bf_dna
bf_videotex bf_videotex
bf_blenfont bf_blenfont
bf_audaspace bf_intern_audaspace
blenkernel_blc blenkernel_blc
extern_binreloc extern_binreloc
extern_glew extern_glew
@@ -120,7 +120,7 @@ IF(UNIX)
ENDIF(WITH_QUICKTIME) ENDIF(WITH_QUICKTIME)
IF(WITH_CXX_GUARDEDALLOC) IF(WITH_CXX_GUARDEDALLOC)
SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_guardedalloc_cpp) SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_intern_guardedalloc_cpp)
ENDIF(WITH_CXX_GUARDEDALLOC) ENDIF(WITH_CXX_GUARDEDALLOC)
FOREACH(SORTLIB ${BLENDER_SORTED_LIBS}) FOREACH(SORTLIB ${BLENDER_SORTED_LIBS})

56
source/creator/CMakeLists.txt
View File

@@ -383,10 +383,10 @@ ADD_DEPENDENCIES(blender makesdna)
FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS) FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} bf_windowmanager blender_render) SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} bf_windowmanager bf_render)
IF(WITH_FLUID) IF(WITH_FLUID)
SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} bf_elbeem) SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} bf_intern_elbeem)
ENDIF(WITH_FLUID) ENDIF(WITH_FLUID)
IF(CMAKE_SYSTEM_NAME MATCHES "Linux") IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -436,11 +436,11 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
bf_editor_animation bf_editor_animation
bf_editor_datafiles bf_editor_datafiles
blender_BSP bf_intern_bsp
blender_render bf_render
blender_ONL bf_intern_opennl
bf_python bf_python
bf_gen_python bf_python_ext
bf_ikplugin bf_ikplugin
bf_modifiers bf_modifiers
bf_blenkernel bf_blenkernel
@@ -448,8 +448,8 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
bf_gpu bf_gpu
bf_blenloader bf_blenloader
bf_blenlib bf_blenlib
bf_ghost bf_intern_ghost
bf_string bf_intern_string
bf_blenpluginapi bf_blenpluginapi
bf_imbuf bf_imbuf
bf_avi bf_avi
@@ -458,24 +458,24 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
bf_dds bf_dds
bf_readblenfile bf_readblenfile
bf_collada bf_collada
blender_BSP bf_intern_bsp
blender_bop bf_intern_bop
bf_kernel bf_kernel
bf_decimation bf_intern_decimate
bf_elbeem bf_intern_elbeem
bf_IK bf_intern_ik
bf_memutil bf_intern_memutil
bf_guardedalloc bf_intern_guardedalloc
blender_CTR bf_intern_ctr
bf_moto bf_intern_moto
bf_windowmanager bf_windowmanager
bf_blroutines bf_blroutines
bf_converter bf_converter
bf_dummy bf_dummy
bf_bullet bf_bullet
bf_smoke bf_intern_smoke
bf_minilzo extern_minilzo
bf_lzma extern_lzma
bf_common bf_common
bf_ketsji bf_ketsji
bf_logic bf_logic
@@ -483,32 +483,32 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
bf_oglrasterizer bf_oglrasterizer
bf_expressions bf_expressions
bf_scenegraph bf_scenegraph
bf_moto bf_intern_moto
bf_blroutines bf_blroutines
kx_network kx_network
bf_kernel bf_kernel
bf_ngnetwork bf_ngnetwork
extern_bullet extern_bullet
bf_loopbacknetwork bf_loopbacknetwork
bf_ITASC bf_intern_itasc
bf_common bf_common
bf_moto bf_intern_moto
bf_python bf_python
bf_gen_python bf_python_ext
extern_binreloc extern_binreloc
extern_glew extern_glew
extern_libopenjpeg extern_openjpeg
bf_videotex bf_videotex
bf_rna bf_rna
bf_dna bf_dna
bf_blenfont bf_blenfont
bf_audaspace bf_intern_audaspace
bf_decimation bf_intern_decimate
) )
IF(WITH_CXX_GUARDEDALLOC) IF(WITH_CXX_GUARDEDALLOC)
SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_guardedalloc_cpp) SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_intern_guardedalloc_cpp)
ENDIF(WITH_CXX_GUARDEDALLOC) ENDIF(WITH_CXX_GUARDEDALLOC)
IF(WITH_QUICKTIME) IF(WITH_QUICKTIME)