From 8ae61aa7b283a3feb16ec8d7c03900e4ad9e467a Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Fri, 18 Jul 2025 22:12:37 -0500 Subject: [PATCH] CMake: Move creation of qt.conf --- cMake/FreeCAD_Helpers/CopyLibpackDirectories.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cMake/FreeCAD_Helpers/CopyLibpackDirectories.cmake b/cMake/FreeCAD_Helpers/CopyLibpackDirectories.cmake index 9cab4f3dbd..1f0d656095 100644 --- a/cMake/FreeCAD_Helpers/CopyLibpackDirectories.cmake +++ b/cMake/FreeCAD_Helpers/CopyLibpackDirectories.cmake @@ -3,12 +3,12 @@ macro(CopyLibpackDirectories) if(FREECAD_COPY_DEPEND_DIRS_TO_BUILD) message(STATUS "Copying libpack dependency directories to build directory...") file(COPY ${FREECAD_LIBPACK_DIR}/bin/assistant.exe DESTINATION ${CMAKE_BINARY_DIR}/bin) - file(COPY ${FREECAD_LIBPACK_DIR}/bin/qt.conf DESTINATION ${CMAKE_BINARY_DIR}/bin) file(COPY ${FREECAD_LIBPACK_DIR}/plugins/platforms DESTINATION ${CMAKE_BINARY_DIR}/bin) file(COPY ${FREECAD_LIBPACK_DIR}/plugins/imageformats DESTINATION ${CMAKE_BINARY_DIR}/bin) file(COPY ${FREECAD_LIBPACK_DIR}/plugins/iconengines DESTINATION ${CMAKE_BINARY_DIR}/bin) file(COPY ${FREECAD_LIBPACK_DIR}/plugins/sqldrivers DESTINATION ${CMAKE_BINARY_DIR}/bin) file(COPY ${FREECAD_LIBPACK_DIR}/plugins/styles DESTINATION ${CMAKE_BINARY_DIR}/bin) + file(WRITE ${CMAKE_BINARY_DIR}/bin/qt.conf "[Paths]\nPrefix=..\n") if(NOT FREECAD_LIBPACK_VERSION VERSION_GREATER_EQUAL "3.0.0") file(COPY ${FREECAD_LIBPACK_DIR}/plugins/printsupport DESTINATION ${CMAKE_BINARY_DIR}/bin) endif() @@ -45,7 +45,6 @@ macro(CopyLibpackDirectories) if(FREECAD_LIBPACK_VERSION VERSION_LESS "3.1.0") file(COPY ${FREECAD_LIBPACK_DIR}/resources DESTINATION ${CMAKE_BINARY_DIR}) endif() - file(WRITE ${CMAKE_BINARY_DIR}/bin/qt.conf "[Paths]\nPrefix=..\n") endif() endif()