Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 19:29:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

don't call copy dll step for scribe

Browse source
This commit is contained in:
Stephen Birarda 2015-02-25 11:02:05 -08:00
parent 66ab2ba9f9
commit 33b0fd24a6
2 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
cmake/macros/CopyDllsBesideWindowsExecutable.cmake
View file

@ -11,12 +11,6 @@
macro(COPY_DLLS_BESIDE_WINDOWS_EXECUTABLE) macro(COPY_DLLS_BESIDE_WINDOWS_EXECUTABLE)
if (NOT ${ARGN})
set(USES_QT TRUE)
else ()
set(USES_QT ${ARGN})
endif ()
if (WIN32) if (WIN32)
configure_file( configure_file(
${HIFI_CMAKE_DIR}/templates/FixupBundlePostBuild.cmake.in ${HIFI_CMAKE_DIR}/templates/FixupBundlePostBuild.cmake.in
@ -33,16 +27,13 @@ macro(COPY_DLLS_BESIDE_WINDOWS_EXECUTABLE)
-P ${CMAKE_CURRENT_BINARY_DIR}/FixupBundlePostBuild.cmake -P ${CMAKE_CURRENT_BINARY_DIR}/FixupBundlePostBuild.cmake
) )
if (USES_QT) find_program(WINDEPLOYQT_COMMAND windeployqt PATHS ${QT_DIR}/bin NO_DEFAULT_PATH)
find_program(WINDEPLOYQT_COMMAND windeployqt PATHS ${QT_DIR}/bin NO_DEFAULT_PATH)
# add a post-build command to call windeployqt to copy Qt plugins
# add a post-build command to call windeployqt to copy Qt plugins add_custom_command(
add_custom_command( TARGET ${TARGET_NAME}
TARGET ${TARGET_NAME} POST_BUILD
POST_BUILD COMMAND CMD /C "SET PATH=%PATH%;${QT_DIR}/bin && ${WINDEPLOYQT_COMMAND} --no-libraries $<TARGET_FILE:${TARGET_NAME}>"
COMMAND CMD /C "SET PATH=%PATH%;${QT_DIR}/bin && ${WINDEPLOYQT_COMMAND} --no-libraries $<TARGET_FILE:${TARGET_NAME}>" )
)
endif ()
endif () endif ()
endmacro() endmacro()

4
tools/scribe/CMakeLists.txt
View file

@ -1,4 +1,2 @@
set(TARGET_NAME scribe) set(TARGET_NAME scribe)
setup_hifi_project() setup_hifi_project()
copy_dlls_beside_windows_executable(false)