Merge branch 'master' of https://github.com/biometrics/openbr

Charles Otto
2 parents ba5f51af ea858027
Showing 5 changed files with 8 additions and 8 deletions
CMakeLists.txt
app/CMakeLists.txt
app/OpenBR/CMakeLists.txt
app/br-gui/CMakeLists.txt
app/OpenBR/OpenBR.cpp → app/br-gui/br-gui.cpp
@@ -142,7 +142,7 @@ if(CMAKE_HOST_WIN32)
   if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
     set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64")
   endif()
-  set(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\OpenBR.exe")
+  set(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\br-gui.exe")
 elseif(CMAKE_HOST_APPLE)
   configure_file("${CMAKE_CURRENT_SOURCE_DIR}/README.md" "README.txt" COPYONLY)
   set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
@@ -5,4 +5,4 @@ add_subdirectory(br)
 add_subdirectory(examples)
  
 # Build OpenBR GUI application
-add_subdirectory(OpenBR)
+add_subdirectory(br-gui)
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-add_executable(OpenBR WIN32 OpenBR.cpp ${BR_RESOURCES})
-qt5_use_modules(OpenBR ${QT_DEPENDENCIES})
-target_link_libraries(OpenBR openbr ${BR_THIRDPARTY_LIBS})
-install(TARGETS OpenBR RUNTIME DESTINATION bin)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+add_executable(br-gui WIN32 br-gui.cpp ${BR_RESOURCES})
+qt5_use_modules(br-gui ${QT_DEPENDENCIES})
+target_link_libraries(br-gui openbr ${BR_THIRDPARTY_LIBS})
+install(TARGETS br-gui RUNTIME DESTINATION bin)
@@ -105,4 +105,4 @@ int main(int argc, char *argv[])
     return result;
 }
  
-#include "OpenBR.moc"
+#include "br-gui.moc"