diff --git a/cmake/Libraries.cmake b/cmake/Libraries.cmake index 07760882d..c87c8906d 100644 --- a/cmake/Libraries.cmake +++ b/cmake/Libraries.cmake @@ -33,7 +33,7 @@ macro(configure_libs) find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core Widgets Network) - #Define the location of qt deployment tool + # Define the location of Qt deployment tool if(WIN32) if (CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT VCPKG_INSTALL_DIR STREQUAL "") find_program(DEPLOYQT windeployqt.debug.bat) diff --git a/deploy/windows/deploy.cmake b/deploy/windows/deploy.cmake index bc8f21a67..b0806cceb 100644 --- a/deploy/windows/deploy.cmake +++ b/deploy/windows/deploy.cmake @@ -5,13 +5,6 @@ # calling CMAKE_CURRENT_LIST_DIR after include would return the wrong scope var set(MY_DIR ${CMAKE_CURRENT_LIST_DIR}) - -# Configure the windows version rc file -configure_file( - ${MY_DIR}/version.rc.in - ${PROJECT_BINARY_DIR}/src/version.rc @ONLY -) - install(CODE "execute_process( COMMAND ${DEPLOYQT} --no-compiler-runtime --no-system-d3d-compiler --no-quick-import -network \"\${CMAKE_INSTALL_PREFIX}/deskflow.exe\" )") diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt index dca488ab2..4e7e7f110 100644 --- a/src/apps/CMakeLists.txt +++ b/src/apps/CMakeLists.txt @@ -14,6 +14,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +# Configure the windows version rc file +configure_file(res/version.rc.in ${PROJECT_BINARY_DIR}/src/version.rc @ONLY) + option(BUILD_UNIFIED "Build unified binary" OFF) if(BUILD_UNIFIED) add_subdirectory(deskflow-core) diff --git a/deploy/windows/version.rc.in b/src/apps/res/version.rc.in similarity index 100% rename from deploy/windows/version.rc.in rename to src/apps/res/version.rc.in