diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06dbbeb601641b735b94a2bf698796d583bf3ced..909c6dead7d33dcc444e7eb2d5a35c015ba79c78 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,8 +61,8 @@ webserver-deploy: - devenv ftl.utu.fi.sln /build Release - rmdir /q /s "%DEPLOY_DIR%/%CI_COMMIT_REF_SLUG%" - mkdir "%DEPLOY_DIR%/%CI_COMMIT_REF_SLUG%" - - 'copy "applications\vision\Release\ftl-vision.exe" "%DEPLOY_DIR%\%CI_COMMIT_REF_SLUG%"' - - 'copy "applications\gui2\Release\ftl-gui2.exe" "%DEPLOY_DIR%\%CI_COMMIT_REF_SLUG%"' + - 'copy "applications\vision\Release\voltu-vision.exe" "%DEPLOY_DIR%\%CI_COMMIT_REF_SLUG%"' + - 'copy "applications\gui2\Release\voltu-ui.exe" "%DEPLOY_DIR%\%CI_COMMIT_REF_SLUG%"' windows-vision: except: diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d348360078b5ab4986a3f0f84084672ab72e995..3ae42fe6c62d7cc2516c46717cced183ca8c007e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -516,7 +516,7 @@ configure_file(${CMAKE_SOURCE_DIR}/components/common/cpp/src/config.cpp.in if (WIN32) # TODO(nick) Should do based upon compiler (VS) set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${VS_STARTUP_PROJECT}) - set_property(TARGET ftl-vision PROPERTY VS_DEBUGGER_WORKING_DIRECTORY ${VS_DEBUG_WORKING_DIRECTORY}) + set_property(TARGET voltu-vision PROPERTY VS_DEBUGGER_WORKING_DIRECTORY ${VS_DEBUG_WORKING_DIRECTORY}) endif() include(ftl_CPack)