smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: Prevent issue where build packages is off with version.rc not being generated

Browse source
This commit is contained in:
sithlord48 2025-01-07 15:50:14 -05:00 committed by Chris Rizzitello
parent c165413e5b
commit fd4ffb6f60
4 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/Libraries.cmake
View file

@ -33,7 +33,7 @@ macro(configure_libs)
find_package(Qt6 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core Widgets Network) 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(WIN32)
if (CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT VCPKG_INSTALL_DIR STREQUAL "") if (CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT VCPKG_INSTALL_DIR STREQUAL "")
find_program(DEPLOYQT windeployqt.debug.bat) find_program(DEPLOYQT windeployqt.debug.bat)

7
deploy/windows/deploy.cmake
View file

@ -5,13 +5,6 @@
# calling CMAKE_CURRENT_LIST_DIR after include would return the wrong scope var # calling CMAKE_CURRENT_LIST_DIR after include would return the wrong scope var
set(MY_DIR ${CMAKE_CURRENT_LIST_DIR}) 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( install(CODE "execute_process(
COMMAND ${DEPLOYQT} --no-compiler-runtime --no-system-d3d-compiler --no-quick-import -network \"\${CMAKE_INSTALL_PREFIX}/deskflow.exe\" COMMAND ${DEPLOYQT} --no-compiler-runtime --no-system-d3d-compiler --no-quick-import -network \"\${CMAKE_INSTALL_PREFIX}/deskflow.exe\"
)") )")

3
src/apps/CMakeLists.txt
View file

@ -14,6 +14,9 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# 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) option(BUILD_UNIFIED "Build unified binary" OFF)
if(BUILD_UNIFIED) if(BUILD_UNIFIED)
add_subdirectory(deskflow-core) add_subdirectory(deskflow-core)

0
deploy/windows/version.rc.in → src/apps/res/version.rc.in
View file