Commit c04f31c4c1cc2fd216a5b7714ab0bb941168b34a
1 parent
69d0258d
renamed a few internal cmake variables
Showing
2 changed files
with
2 additions
and
3 deletions
openbr/CMakeLists.txt
| @@ -10,12 +10,12 @@ include(plugins/plugins.cmake) | @@ -10,12 +10,12 @@ include(plugins/plugins.cmake) | ||
| 10 | # Optional GUI module | 10 | # Optional GUI module |
| 11 | if(NOT ${BR_EMBEDDED}) | 11 | if(NOT ${BR_EMBEDDED}) |
| 12 | aux_source_directory(gui BR_GUI) | 12 | aux_source_directory(gui BR_GUI) |
| 13 | - qt5_add_resources(ICONS icons/icons.qrc) | 13 | + qt5_add_resources(BR_ICONS icons/icons.qrc) |
| 14 | file(GLOB HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/gui/*.h) | 14 | file(GLOB HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/gui/*.h) |
| 15 | install(FILES ${HEADERS} DESTINATION include/openbr/gui) | 15 | install(FILES ${HEADERS} DESTINATION include/openbr/gui) |
| 16 | endif() | 16 | endif() |
| 17 | 17 | ||
| 18 | -add_library(openbr SHARED ${SRC} ${BR_CORE} ${BR_GUI} ${BR_PLUGIN} ${BR_THIRDPARTY_SRC} ${BR_RESOURCES} ${ICONS} ${NATURALSTRINGCOMPARE_SRC}) | 18 | +add_library(openbr SHARED ${SRC} ${BR_CORE} ${BR_GUI} ${BR_ICONS} ${BR_THIRDPARTY_SRC} ${BR_RESOURCES} ${NATURALSTRINGCOMPARE_SRC}) |
| 19 | qt5_use_modules(openbr ${QT_DEPENDENCIES}) | 19 | qt5_use_modules(openbr ${QT_DEPENDENCIES}) |
| 20 | set_target_properties(openbr PROPERTIES | 20 | set_target_properties(openbr PROPERTIES |
| 21 | DEFINE_SYMBOL BR_LIBRARY | 21 | DEFINE_SYMBOL BR_LIBRARY |
openbr/plugins/plugins.cmake
| @@ -12,4 +12,3 @@ foreach(PLUGIN ${PLUGINS} ${BR_THIRDPARTY_PLUGINS}) | @@ -12,4 +12,3 @@ foreach(PLUGIN ${PLUGINS} ${BR_THIRDPARTY_PLUGINS}) | ||
| 12 | set(BR_THIRDPARTY_SRC ${BR_THIRDPARTY_SRC} ${PLUGIN}) | 12 | set(BR_THIRDPARTY_SRC ${BR_THIRDPARTY_SRC} ${PLUGIN}) |
| 13 | endif() | 13 | endif() |
| 14 | endforeach() | 14 | endforeach() |
| 15 | - |