Commit ea8580270f5e1cfb41d83b6df33e1de1e5018d21

Authored by Josh Klontz
1 parent 885c3ec1

fixed #120

CMakeLists.txt
@@ -142,7 +142,7 @@ if(CMAKE_HOST_WIN32) @@ -142,7 +142,7 @@ if(CMAKE_HOST_WIN32)
142 if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") 142 if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
143 set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64") 143 set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64")
144 endif() 144 endif()
145 - set(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\OpenBR.exe") 145 + set(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\br-gui.exe")
146 elseif(CMAKE_HOST_APPLE) 146 elseif(CMAKE_HOST_APPLE)
147 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/README.md" "README.txt" COPYONLY) 147 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/README.md" "README.txt" COPYONLY)
148 set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_BINARY_DIR}/README.txt") 148 set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
app/CMakeLists.txt
@@ -5,4 +5,4 @@ add_subdirectory(br) @@ -5,4 +5,4 @@ add_subdirectory(br)
5 add_subdirectory(examples) 5 add_subdirectory(examples)
6 6
7 # Build OpenBR GUI application 7 # Build OpenBR GUI application
8 -add_subdirectory(OpenBR) 8 +add_subdirectory(br-gui)
app/OpenBR/CMakeLists.txt deleted
1 -include_directories(${CMAKE_CURRENT_BINARY_DIR})  
2 -add_executable(OpenBR WIN32 OpenBR.cpp ${BR_RESOURCES})  
3 -qt5_use_modules(OpenBR ${QT_DEPENDENCIES})  
4 -target_link_libraries(OpenBR openbr ${BR_THIRDPARTY_LIBS})  
5 -install(TARGETS OpenBR RUNTIME DESTINATION bin)  
app/br-gui/CMakeLists.txt 0 → 100644
  1 +include_directories(${CMAKE_CURRENT_BINARY_DIR})
  2 +add_executable(br-gui WIN32 br-gui.cpp ${BR_RESOURCES})
  3 +qt5_use_modules(br-gui ${QT_DEPENDENCIES})
  4 +target_link_libraries(br-gui openbr ${BR_THIRDPARTY_LIBS})
  5 +install(TARGETS br-gui RUNTIME DESTINATION bin)
app/OpenBR/OpenBR.cpp renamed to app/br-gui/br-gui.cpp
@@ -105,4 +105,4 @@ int main(int argc, char *argv[]) @@ -105,4 +105,4 @@ int main(int argc, char *argv[])
105 return result; 105 return result;
106 } 106 }
107 107
108 -#include "OpenBR.moc" 108 +#include "br-gui.moc"