mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 16:41:02 +02:00
try performing copy in PRE_BUILD for VS
This commit is contained in:
parent
3c7f1cc565
commit
e8ee9e4b3a
3 changed files with 3 additions and 9 deletions
|
@ -23,7 +23,7 @@ macro(SETUP_HIFI_PROJECT)
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
# add the executable, include additional optional sources
|
# add the executable, include additional optional sources
|
||||||
add_executable(${TARGET_NAME} ${TARGET_SRCS} ${TARGET_RSRCS} "${AUTOMTC_SRC}" )
|
add_executable(${TARGET_NAME} ${TARGET_SRCS} "${AUTOMTC_SRC}" )
|
||||||
|
|
||||||
set(${TARGET_NAME}_DEPENDENCY_QT_MODULES ${ARGN})
|
set(${TARGET_NAME}_DEPENDENCY_QT_MODULES ${ARGN})
|
||||||
list(APPEND ${TARGET_NAME}_DEPENDENCY_QT_MODULES Core)
|
list(APPEND ${TARGET_NAME}_DEPENDENCY_QT_MODULES Core)
|
||||||
|
|
|
@ -21,13 +21,13 @@ macro(SYMLINK_OR_COPY_DIRECTORY_BESIDE_TARGET _SHOULD_SYMLINK _DIRECTORY _DESTIN
|
||||||
else ()
|
else ()
|
||||||
# remove the current directory
|
# remove the current directory
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
TARGET ${TARGET_NAME} POST_BUILD
|
TARGET ${TARGET_NAME} PRE_BUILD
|
||||||
COMMAND "${CMAKE_COMMAND}" -E remove_directory $<TARGET_FILE_DIR:${TARGET_NAME}>/${_DESTINATION}
|
COMMAND "${CMAKE_COMMAND}" -E remove_directory $<TARGET_FILE_DIR:${TARGET_NAME}>/${_DESTINATION}
|
||||||
)
|
)
|
||||||
|
|
||||||
# copy the directory
|
# copy the directory
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
TARGET ${TARGET_NAME} POST_BUILD
|
TARGET ${TARGET_NAME} PRE_BUILD
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_directory ${_DIRECTORY}
|
COMMAND ${CMAKE_COMMAND} -E copy_directory ${_DIRECTORY}
|
||||||
$<TARGET_FILE_DIR:${TARGET_NAME}>/${_DESTINATION}
|
$<TARGET_FILE_DIR:${TARGET_NAME}>/${_DESTINATION}
|
||||||
)
|
)
|
||||||
|
|
|
@ -6,12 +6,6 @@ else ()
|
||||||
set(_SHOULD_SYMLINK_RESOURCES FALSE)
|
set(_SHOULD_SYMLINK_RESOURCES FALSE)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (NOT ${_SHOULD_SYMLINK_RESOURCES})
|
|
||||||
# since we aren't going to symlink the resources, we should add them as sources for this target
|
|
||||||
# this should cause the target to be re-built should one of the files change
|
|
||||||
file(GLOB_RECURSE TARGET_RSRCS "${CMAKE_CURRENT_SOURCE_DIR}/resources/*")
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
# setup the project and link required Qt modules
|
# setup the project and link required Qt modules
|
||||||
setup_hifi_project(Network)
|
setup_hifi_project(Network)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue