Commit 18d4191a authored by Jan Möbius's avatar Jan Möbius

Fixed build dependency problems with link dirs if pluginlib contains special libs

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@8444 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 16b1310e
...@@ -11,9 +11,32 @@ include_directories ( ...@@ -11,9 +11,32 @@ include_directories (
${GLUT_INCLUDE_DIR} ${GLUT_INCLUDE_DIR}
) )
link_directories ( # Linking for apple is special here as the linker pulls in the dependencies, we have to set them like in PluginLib!
${GLEW_LIBRARY_DIR} if( APPLE )
)
# search all ObjectTypes in the ObjectType directory for additional build information
file (
GLOB _plugin_buildinfos
RELATIVE "${CMAKE_SOURCE_DIR}"
"${CMAKE_SOURCE_DIR}/ObjectTypes/*/CMakeLists.txt"
)
# include all cmake files fouund for objecttypes here
foreach ( _buildInfo ${_plugin_buildinfos})
include ("${CMAKE_SOURCE_DIR}/${_buildInfo}")
endforeach ()
link_directories (
${GLEW_LIBRARY_DIR}
${ADDITIONAL_PLUGINLIB_LINK_DIRS}
)
else (APPLE)
link_directories (
${GLEW_LIBRARY_DIR}
)
endif(APPLE)
# source code directories # source code directories
set (directories set (directories
......
...@@ -197,14 +197,38 @@ function (_build_openflipper_plugin plugin) ...@@ -197,14 +197,38 @@ function (_build_openflipper_plugin plugin)
${GLUT_INCLUDE_DIR} ${GLUT_INCLUDE_DIR}
) )
link_directories ( # Linking for apple is special here as the linker pulls in the dependencies, we have to set them like in PluginLib!
${${_PLUGIN}_DEPS_LIBDIRS} if( APPLE )
${${_PLUGIN}_LIBDIRS}
) # search all ObjectTypes in the ObjectType directory for additional build information
file (
GLOB _plugin_buildinfos
RELATIVE "${CMAKE_SOURCE_DIR}"
"${CMAKE_SOURCE_DIR}/ObjectTypes/*/CMakeLists.txt"
)
# include all cmake files fouund for objecttypes here
foreach ( _buildInfo ${_plugin_buildinfos})
include ("${CMAKE_SOURCE_DIR}/${_buildInfo}")
endforeach ()
link_directories (
${${_PLUGIN}_DEPS_LIBDIRS}
${${_PLUGIN}_LIBDIRS}
${ADDITIONAL_PLUGINLIB_LINK_DIRS}
)
else (APPLE)
link_directories (
${${_PLUGIN}_DEPS_LIBDIRS}
${${_PLUGIN}_LIBDIRS}
)
endif(APPLE)
set (directories set (directories
. .
${${_PLUGIN}_DIRS} ${${_PLUGIN}_DIRS}
) )
# collect all header,source and ui files # collect all header,source and ui files
......
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