diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-14 05:02:57 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-14 05:02:57 +0400 |
| commit | 21253def7ca013b60b87b6063b932121e65dae0a (patch) | |
| tree | 04c65684cf168c71d9cbc525f14357c9461062ca /source/creator | |
| parent | 1741269d30d30886422986d737324ddf3794432c (diff) | |
- removed some duplicate library links from cmake (which were needed because of bad level calls)
- FindXML2 we had copied from another project was always running and not using cached value, rewrote based on template used for most of our other find modules which makes use of 'FindPackageHandleStandardArgs'
- mark statuc collada libs as advanced.
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 93236f93ceb..2d2e6f8ecf9 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -712,7 +712,12 @@ add_dependencies(blender makesdna) get_property(BLENDER_LINK_LIBS GLOBAL PROPERTY BLENDER_LINK_LIBS) -set(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} bf_windowmanager bf_render) +set(BLENDER_LINK_LIBS + bf_nodes + ${BLENDER_LINK_LIBS} + bf_windowmanager + bf_render +) if(WITH_MOD_FLUID) list(APPEND BLENDER_LINK_LIBS bf_intern_elbeem) @@ -797,8 +802,8 @@ endif() bf_intern_smoke extern_minilzo extern_lzma - extern_recastnavigation ge_logic_ketsji + extern_recastnavigation ge_phys_common ge_logic ge_rasterizer @@ -806,7 +811,6 @@ endif() ge_logic_expressions ge_scenegraph ge_logic_network - bf_python # duplicate for BPY_driver_exec ge_logic_ngnetwork extern_bullet ge_logic_loopbacknetwork @@ -819,8 +823,6 @@ endif() bf_blenfont bf_intern_audaspace bf_intern_mikktspace - extern_recastnavigation - bf_editor_util # --- BAD LEVEL CALL HERE --- XXX, this should be removed before release! ) if(WITH_MOD_CLOTH_ELTOPO) |