diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 11:16:27 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 11:16:27 +0300 |
| commit | bccc10db9a90d365c353baebf443fde2030ce970 (patch) | |
| tree | 2c2e1fd94b29667a809f8d7285d049f5ff5d424d /indra/cmake/CMakeCopyIfDifferent.cmake | |
| parent | 531cd34f670170ade57f8813fe48012b61a1d3c2 (diff) | |
| parent | bb3c36f5cbc0c3b542045fd27255eee24e03da22 (diff) | |
Merge branch 'main' into marchcat/x-b-merge
# Conflicts:
# autobuild.xml
# indra/cmake/ConfigurePkgConfig.cmake
# indra/cmake/ICU4C.cmake
# indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
# indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
# indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
# indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
# indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
# indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llfloateremojipicker.cpp
# indra/newview/lloutfitslist.cpp
Diffstat (limited to 'indra/cmake/CMakeCopyIfDifferent.cmake')
| -rw-r--r-- | indra/cmake/CMakeCopyIfDifferent.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/cmake/CMakeCopyIfDifferent.cmake b/indra/cmake/CMakeCopyIfDifferent.cmake index 55e71ff153..fe6806e38b 100644 --- a/indra/cmake/CMakeCopyIfDifferent.cmake +++ b/indra/cmake/CMakeCopyIfDifferent.cmake @@ -10,20 +10,20 @@ MACRO(COPY_IF_DIFFERENT FROM_DIR TO_DIR TARGETS) # Macro to implement copy_if_different for a list of files -# Arguments - +# Arguments - # FROM_DIR - this is the source directory # TO_DIR - this is the destination directory # TARGETS - A variable to receive a list of targets -# FILES - names of the files to copy -# TODO: add globing. +# FILES - names of the files to copy +# TODO: add globing. SET(AddTargets "") FOREACH(SRC ${ARGN}) - GET_FILENAME_COMPONENT(SRCFILE ${SRC} NAME) + GET_FILENAME_COMPONENT(SRCFILE ${SRC} NAME) IF("${FROM_DIR}" STREQUAL "") SET(FROM ${SRC}) ELSE("${FROM_DIR}" STREQUAL "") SET(FROM ${FROM_DIR}/${SRC}) - ENDIF("${FROM_DIR}" STREQUAL "") + ENDIF("${FROM_DIR}" STREQUAL "") IF("${TO_DIR}" STREQUAL "") SET(TO ${SRCFILE}) ELSE("${TO_DIR}" STREQUAL "") |