Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 05:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMAKE] Avoid generator expresisons in install()'s RENAME argument. CORE-14509

Browse source 
This fixes rostests_install, and thus hopefully WHS-Testbot.
This commit is contained in:
Thomas Faber 2018-04-02 09:57:51 +02:00
parent a67df65c4f
commit 9e6f3ef12b
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sdk/cmake/CMakeMacros.cmake
View file

@ -855,14 +855,15 @@ function(add_rostests_file)
message(FATAL_ERROR "You must provide a target or a file to install!") message(FATAL_ERROR "You must provide a target or a file to install!")
endif() endif()
set(_ROSTESTS_NAME_ON_CD "${_ROSTESTS_RENAME}")
if(NOT _ROSTESTS_FILE) if(NOT _ROSTESTS_FILE)
set(_ROSTESTS_FILE "$<TARGET_FILE:${_ROSTESTS_TARGET}>") set(_ROSTESTS_FILE "$<TARGET_FILE:${_ROSTESTS_TARGET}>")
if(NOT _ROSTESTS_RENAME) if(NOT _ROSTESTS_RENAME)
set(_ROSTESTS_RENAME "$<TARGET_FILE_NAME:${_ROSTESTS_TARGET}>") set(_ROSTESTS_NAME_ON_CD "$<TARGET_FILE_NAME:${_ROSTESTS_TARGET}>")
endif() endif()
else() else()
if(NOT _ROSTESTS_RENAME) if(NOT _ROSTESTS_RENAME)
get_filename_component(_ROSTESTS_RENAME ${_ROSTESTS_FILE} NAME) get_filename_component(_ROSTESTS_NAME_ON_CD ${_ROSTESTS_FILE} NAME)
endif() endif()
endif() endif()
@ -871,12 +872,16 @@ function(add_rostests_file)
endif() endif()
if(_ROSTESTS_TARGET) if(_ROSTESTS_TARGET)
add_cd_file(TARGET ${_ROSTESTS_TARGET} FILE ${_ROSTESTS_FILE} DESTINATION "reactos/bin${_ROSTESTS_SUBDIR}" NAME_ON_CD ${_ROSTESTS_RENAME} FOR all) add_cd_file(TARGET ${_ROSTESTS_TARGET} FILE ${_ROSTESTS_FILE} DESTINATION "reactos/bin${_ROSTESTS_SUBDIR}" NAME_ON_CD ${_ROSTESTS_NAME_ON_CD} FOR all)
else() else()
add_cd_file(FILE ${_ROSTESTS_FILE} DESTINATION "reactos/bin${_ROSTESTS_SUBDIR}" NAME_ON_CD ${_ROSTESTS_RENAME} FOR all) add_cd_file(FILE ${_ROSTESTS_FILE} DESTINATION "reactos/bin${_ROSTESTS_SUBDIR}" NAME_ON_CD ${_ROSTESTS_NAME_ON_CD} FOR all)
endif() endif()
if(DEFINED ENV{ROSTESTS_INSTALL}) if(DEFINED ENV{ROSTESTS_INSTALL})
install(FILES ${_ROSTESTS_FILE} DESTINATION "$ENV{ROSTESTS_INSTALL}${_ROSTESTS_SUBDIR}" COMPONENT rostests RENAME ${_ROSTESTS_RENAME}) if(_ROSTESTS_RENAME)
install(FILES ${_ROSTESTS_FILE} DESTINATION "$ENV{ROSTESTS_INSTALL}${_ROSTESTS_SUBDIR}" COMPONENT rostests RENAME ${_ROSTESTS_RENAME})
else()
install(FILES ${_ROSTESTS_FILE} DESTINATION "$ENV{ROSTESTS_INSTALL}${_ROSTESTS_SUBDIR}" COMPONENT rostests)
endif()
endif() endif()
endfunction() endfunction()