Peter M. Groen / openbr

Commit c8b9c4dd8b5e3b03546a61b2bfc301384799a81f

Authored by Jordan Cheney
1 parent 059b6c96

Death to cmake errors

Inline Side-by-side
Showing 1 changed file with 4 additions and 2 deletions
openbr/plugins/plugins.cmake
  View file @c8b9c4d
1 # Optional Appendable CMake Variables: 1 # Optional Appendable CMake Variables:
2 # BR_THIRDPARTY_PLUGINS - Additional plugins 2 # BR_THIRDPARTY_PLUGINS - Additional plugins
3 # BR_THIRDPARTY_PLUGINS_DIR - Additional folder(s) of plugins 3 # BR_THIRDPARTY_PLUGINS_DIR - Additional folder(s) of plugins
  4 +# BR_EXCLUDED_PLUGINS - Plugins that should not be built
4 # BR_THIRDPARTY_SRC - Additional source code needed by a plugin 5 # BR_THIRDPARTY_SRC - Additional source code needed by a plugin
5 # BR_THIRDPARTY_LIBS - Additional libaries needed by a plugin 6 # BR_THIRDPARTY_LIBS - Additional libaries needed by a plugin
6 7
@@ -21,14 +22,15 @@ mark_as_advanced(BR_EXCLUDED_PLUGINS) @@ -21,14 +22,15 @@ mark_as_advanced(BR_EXCLUDED_PLUGINS)
21 foreach(DIR plugins/cmake ${BR_THIRDPARTY_PLUGINS_DIR}) 22 foreach(DIR plugins/cmake ${BR_THIRDPARTY_PLUGINS_DIR})
22 file(GLOB CMAKE_FILES ${DIR}/*.cmake) 23 file(GLOB CMAKE_FILES ${DIR}/*.cmake)
23 foreach(CMAKE_FILE ${CMAKE_FILES}) 24 foreach(CMAKE_FILE ${CMAKE_FILES})
24 - include(${CMAKE_FILE}) 25 + if (NOT ${CMAKE_FILE} MATCHES "Find.*cmake")
  26 + include(${CMAKE_FILE})
  27 + endif()
25 endforeach() 28 endforeach()
26 endforeach() 29 endforeach()
27 30
28 # Collect all source files except for excluded plugins 31 # Collect all source files except for excluded plugins
29 foreach(DIR ${BR_PLUGINS_DIR} ${BR_THIRDPARTY_PLUGINS_DIR}) 32 foreach(DIR ${BR_PLUGINS_DIR} ${BR_THIRDPARTY_PLUGINS_DIR})
30 get_filename_component(DIR_NAME ${DIR} NAME) 33 get_filename_component(DIR_NAME ${DIR} NAME)
31 - set(AUTOMOC_TARGETS_FOLDER ${CMAKE_BINARY_DIR}/openbr/${DIR_NAME})  
32 file(GLOB PLUGINS ${DIR}/*.cpp ${DIR}/*.h) 34 file(GLOB PLUGINS ${DIR}/*.cpp ${DIR}/*.h)
33 foreach(PLUGIN ${PLUGINS}) 35 foreach(PLUGIN ${PLUGINS})
34 get_filename_component(PLUGIN_NAME ${PLUGIN} NAME) 36 get_filename_component(PLUGIN_NAME ${PLUGIN} NAME)