From c04f31c4c1cc2fd216a5b7714ab0bb941168b34a Mon Sep 17 00:00:00 2001 From: Josh Klontz Date: Mon, 22 Jul 2013 10:44:13 -0400 Subject: [PATCH] renamed a few internal cmake variables --- openbr/CMakeLists.txt | 4 ++-- openbr/plugins/plugins.cmake | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/openbr/CMakeLists.txt b/openbr/CMakeLists.txt index ae761d7..e343c83 100644 --- a/openbr/CMakeLists.txt +++ b/openbr/CMakeLists.txt @@ -10,12 +10,12 @@ include(plugins/plugins.cmake) # Optional GUI module if(NOT ${BR_EMBEDDED}) aux_source_directory(gui BR_GUI) - qt5_add_resources(ICONS icons/icons.qrc) + qt5_add_resources(BR_ICONS icons/icons.qrc) file(GLOB HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/gui/*.h) install(FILES ${HEADERS} DESTINATION include/openbr/gui) endif() -add_library(openbr SHARED ${SRC} ${BR_CORE} ${BR_GUI} ${BR_PLUGIN} ${BR_THIRDPARTY_SRC} ${BR_RESOURCES} ${ICONS} ${NATURALSTRINGCOMPARE_SRC}) +add_library(openbr SHARED ${SRC} ${BR_CORE} ${BR_GUI} ${BR_ICONS} ${BR_THIRDPARTY_SRC} ${BR_RESOURCES} ${NATURALSTRINGCOMPARE_SRC}) qt5_use_modules(openbr ${QT_DEPENDENCIES}) set_target_properties(openbr PROPERTIES DEFINE_SYMBOL BR_LIBRARY diff --git a/openbr/plugins/plugins.cmake b/openbr/plugins/plugins.cmake index 21af22d..1e35e7b 100644 --- a/openbr/plugins/plugins.cmake +++ b/openbr/plugins/plugins.cmake @@ -12,4 +12,3 @@ foreach(PLUGIN ${PLUGINS} ${BR_THIRDPARTY_PLUGINS}) set(BR_THIRDPARTY_SRC ${BR_THIRDPARTY_SRC} ${PLUGIN}) endif() endforeach() - -- libgit2 0.21.4