From ee10ec7ba06336c7ed1509d127872b58cb9893dc Mon Sep 17 00:00:00 2001 From: Josh Klontz Date: Fri, 25 Oct 2013 09:53:14 -0400 Subject: [PATCH] fixed #120 --- CMakeLists.txt | 2 +- app/CMakeLists.txt | 2 +- app/OpenBR/CMakeLists.txt | 5 ----- app/br-gui/CMakeLists.txt | 5 +++++ app/{OpenBR/OpenBR.cpp => br-gui/br-gui.cpp} | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 app/OpenBR/CMakeLists.txt create mode 100644 app/br-gui/CMakeLists.txt rename app/{OpenBR/OpenBR.cpp => br-gui/br-gui.cpp} (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e9c485cc..d34b9da81 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index af4aa9bad..7b198e41f 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -5,4 +5,4 @@ add_subdirectory(br) add_subdirectory(examples) # Build OpenBR GUI application -add_subdirectory(OpenBR) +add_subdirectory(br-gui) diff --git a/app/OpenBR/CMakeLists.txt b/app/OpenBR/CMakeLists.txt deleted file mode 100644 index a9fe33160..000000000 --- a/app/OpenBR/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -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) diff --git a/app/br-gui/CMakeLists.txt b/app/br-gui/CMakeLists.txt new file mode 100644 index 000000000..757bdd6ca --- /dev/null +++ b/app/br-gui/CMakeLists.txt @@ -0,0 +1,5 @@ +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) diff --git a/app/OpenBR/OpenBR.cpp b/app/br-gui/br-gui.cpp similarity index 99% rename from app/OpenBR/OpenBR.cpp rename to app/br-gui/br-gui.cpp index 1de9dec0f..cfeb059e3 100644 --- a/app/OpenBR/OpenBR.cpp +++ b/app/br-gui/br-gui.cpp @@ -105,4 +105,4 @@ int main(int argc, char *argv[]) return result; } -#include "OpenBR.moc" +#include "br-gui.moc"