Peter M. Groen / openbr

Commit 8ab6c433764c03396050acb382444aaeefc8f29a

Authored by DepthDeluxe
1 parent 37276ffa

reverted other changes that weren't meant for product

Inline Side-by-side
Showing 2 changed files with 6 additions and 3 deletions
app/br/CMakeLists.txt
  View file @8ab6c43
@@ -8,3 +8,4 @@ qt5_use_modules(br ${QT_DEPENDENCIES}) @@ -8,3 +8,4 @@ qt5_use_modules(br ${QT_DEPENDENCIES})
8 8
9 install(TARGETS br RUNTIME DESTINATION bin) 9 install(TARGETS br RUNTIME DESTINATION bin)
10 add_test(NAME br_initialize WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND br) 10 add_test(NAME br_initialize WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND br)
  11 +
openbr/CMakeLists.txt
  View file @8ab6c43
@@ -9,7 +9,6 @@ set(SRC openbr.cpp @@ -9,7 +9,6 @@ set(SRC openbr.cpp
9 aux_source_directory(core BR_CORE) 9 aux_source_directory(core BR_CORE)
10 include(plugins/plugins.cmake) 10 include(plugins/plugins.cmake)
11 11
12 -  
13 # Janus API 12 # Janus API
14 option(BR_WITH_JANUS "Build IARPA Janus related applications." ON) 13 option(BR_WITH_JANUS "Build IARPA Janus related applications." ON)
15 if(BR_WITH_JANUS) 14 if(BR_WITH_JANUS)
@@ -29,7 +28,11 @@ if(NOT BR_EMBEDDED) @@ -29,7 +28,11 @@ if(NOT BR_EMBEDDED)
29 install(FILES ${HEADERS} DESTINATION include/openbr/gui) 28 install(FILES ${HEADERS} DESTINATION include/openbr/gui)
30 endif() 29 endif()
31 30
32 - # otherwise, build with normal system 31 +# Compile third party resources
  32 +if(BR_THIRDPARTY_RESOURCES)
  33 + qt5_add_resources(THIRDPARTY_RESOURCES ${BR_THIRDPARTY_RESOURCES})
  34 +endif()
  35 +
33 add_library(openbr SHARED ${SRC} ${BR_CORE} ${BR_JANUS} ${BR_GUI} ${BR_ICONS} ${BR_THIRDPARTY_SRC} ${BR_RESOURCES} ${NATURALSTRINGCOMPARE_SRC} ${THIRDPARTY_RESOURCES}) 36 add_library(openbr SHARED ${SRC} ${BR_CORE} ${BR_JANUS} ${BR_GUI} ${BR_ICONS} ${BR_THIRDPARTY_SRC} ${BR_RESOURCES} ${NATURALSTRINGCOMPARE_SRC} ${THIRDPARTY_RESOURCES})
34 qt5_use_modules(openbr ${QT_DEPENDENCIES}) 37 qt5_use_modules(openbr ${QT_DEPENDENCIES})
35 set_target_properties(openbr PROPERTIES 38 set_target_properties(openbr PROPERTIES
@@ -37,7 +40,6 @@ set_target_properties(openbr PROPERTIES @@ -37,7 +40,6 @@ set_target_properties(openbr PROPERTIES
37 VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH} 40 VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}
38 SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}) 41 SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR})
39 target_link_libraries(openbr ${BR_THIRDPARTY_LIBS}) 42 target_link_libraries(openbr ${BR_THIRDPARTY_LIBS})
40 -  
41 add_cppcheck(openbr) 43 add_cppcheck(openbr)
42 44
43 # Janus implementation 45 # Janus implementation