From 8ab6c433764c03396050acb382444aaeefc8f29a Mon Sep 17 00:00:00 2001 From: DepthDeluxe Date: Sun, 10 Apr 2016 15:26:10 -0400 Subject: [PATCH] reverted other changes that weren't meant for product --- app/br/CMakeLists.txt | 1 + openbr/CMakeLists.txt | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/br/CMakeLists.txt b/app/br/CMakeLists.txt index 3c3b6a9..dfa60ed 100644 --- a/app/br/CMakeLists.txt +++ b/app/br/CMakeLists.txt @@ -8,3 +8,4 @@ qt5_use_modules(br ${QT_DEPENDENCIES}) install(TARGETS br RUNTIME DESTINATION bin) add_test(NAME br_initialize WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND br) + diff --git a/openbr/CMakeLists.txt b/openbr/CMakeLists.txt index 610dbb8..2fe5774 100644 --- a/openbr/CMakeLists.txt +++ b/openbr/CMakeLists.txt @@ -9,7 +9,6 @@ set(SRC openbr.cpp aux_source_directory(core BR_CORE) include(plugins/plugins.cmake) - # Janus API option(BR_WITH_JANUS "Build IARPA Janus related applications." ON) if(BR_WITH_JANUS) @@ -29,7 +28,11 @@ if(NOT BR_EMBEDDED) install(FILES ${HEADERS} DESTINATION include/openbr/gui) endif() - # otherwise, build with normal system +# Compile third party resources +if(BR_THIRDPARTY_RESOURCES) + qt5_add_resources(THIRDPARTY_RESOURCES ${BR_THIRDPARTY_RESOURCES}) +endif() + add_library(openbr SHARED ${SRC} ${BR_CORE} ${BR_JANUS} ${BR_GUI} ${BR_ICONS} ${BR_THIRDPARTY_SRC} ${BR_RESOURCES} ${NATURALSTRINGCOMPARE_SRC} ${THIRDPARTY_RESOURCES}) qt5_use_modules(openbr ${QT_DEPENDENCIES}) set_target_properties(openbr PROPERTIES @@ -37,7 +40,6 @@ set_target_properties(openbr PROPERTIES VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH} SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}) target_link_libraries(openbr ${BR_THIRDPARTY_LIBS}) - add_cppcheck(openbr) # Janus implementation -- libgit2 0.21.4