Commit f5d69af3 authored by Jan Möbius's avatar Jan Möbius

Cmake extension test for dependencies that have to be linked into the core

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@11784 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 7b10e5f5
...@@ -98,6 +98,11 @@ acg_set (OPENFLIPPER_PLUGINS "") ...@@ -98,6 +98,11 @@ acg_set (OPENFLIPPER_PLUGINS "")
# add plugins # add plugins
of_add_plugins () of_add_plugins ()
# Get list of their dependencies and handle special ones
get_property( global_dependency_list GLOBAL PROPERTY GLOBAL_PLUGIN_DEPENDENCIES_LIST)
message("Dependencies of plugis : ${global_dependency_list}")
# ======================================================================== # ========================================================================
# Bundle generation # Bundle generation
......
...@@ -110,6 +110,7 @@ target_link_libraries (OpenFlipper ...@@ -110,6 +110,7 @@ target_link_libraries (OpenFlipper
${GLEW_LIBRARY} ${GLEW_LIBRARY}
${GLUT_LIBRARIES} ${GLUT_LIBRARIES}
${FTGL_LIBS} ${FTGL_LIBS}
/usr/lib/libOpenNI.so
) )
if (APPLE) if (APPLE)
......
...@@ -91,12 +91,21 @@ endmacro () ...@@ -91,12 +91,21 @@ endmacro ()
# check dependencies # check dependencies
macro (_check_plugin_deps _prefix) macro (_check_plugin_deps _prefix)
message("${_prefix}")
set (${_prefix}_HAS_DEPS TRUE) set (${_prefix}_HAS_DEPS TRUE)
foreach (_val ${ARGN}) foreach (_val ${ARGN})
string (TOUPPER ${_val} _VAL) string (TOUPPER ${_val} _VAL)
find_package(${_val}) find_package(${_val})
message("Dependency : ${_val} ")
get_property( global_dependency_list GLOBAL PROPERTY GLOBAL_PLUGIN_DEPENDENCIES_LIST)
message("Current List: ${global_dependency_list}")
list (APPEND global_dependency_list ${_val} )
set_property( GLOBAL PROPERTY GLOBAL_PLUGIN_DEPENDENCIES_LIST ${global_dependency_list} )
if (${_val}_FOUND OR ${_VAL}_FOUND) if (${_val}_FOUND OR ${_VAL}_FOUND)
foreach (_name ${_val} ${_VAL}) foreach (_name ${_val} ${_VAL})
if (DEFINED ${_name}_INCLUDE_PATH) if (DEFINED ${_name}_INCLUDE_PATH)
......
...@@ -83,9 +83,9 @@ namespace Viewer { ...@@ -83,9 +83,9 @@ namespace Viewer {
sceneCenter_(ACG::Vec3d( 0.0, 0.0, 0.0 )), sceneCenter_(ACG::Vec3d( 0.0, 0.0, 0.0 )),
sceneRadius_(1.0), sceneRadius_(1.0),
trackballCenter_(ACG::Vec3d( 0.0, 0.0, 0.0 )), trackballCenter_(ACG::Vec3d( 0.0, 0.0, 0.0 )),
trackballRadius_(1.0) trackballRadius_(1.0),
viewerId_(_id)
{ {
viewerId_ = _id;
settingsSection_ = "Viewer" + QString::number(_id) + "/"; settingsSection_ = "Viewer" + QString::number(_id) + "/";
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment