summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Palange <palange@lindenlab.com>2008-06-13 16:52:59 +0000
committerMark Palange <palange@lindenlab.com>2008-06-13 16:52:59 +0000
commit31565ac441d1c2608ccb9a5c5d71acc34d639781 (patch)
tree7208f7d3d4fd20c9f8b9051f3f9579c368468672
parent7bab07aedc7764dcfeae3df8cdf8c3ed8211df57 (diff)
Fixes the the copy-win-scripts related cmake files to make the copy_win_scripts target function properly.
-rw-r--r--indra/cmake/CMakeCopyIfDifferent.cmake2
-rw-r--r--indra/copy_win_scripts/CMakeLists.txt6
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/cmake/CMakeCopyIfDifferent.cmake b/indra/cmake/CMakeCopyIfDifferent.cmake
index abbd1d0653..55e71ff153 100644
--- a/indra/cmake/CMakeCopyIfDifferent.cmake
+++ b/indra/cmake/CMakeCopyIfDifferent.cmake
@@ -35,7 +35,7 @@ FOREACH(SRC ${ARGN})
DEPENDS ${FROM}
COMMENT "Copying ${SRCFILE} ${TO_DIR}"
)
- SET(AddTargets ${AddTargets} ${TARGET})
+ SET(AddTargets ${AddTargets} ${TO})
ENDFOREACH(SRC ${ARGN})
SET(${TARGETS} ${AddTargets})
ENDMACRO(COPY_IF_DIFFERENT FROM_DIR TO_DIR TARGETS)
diff --git a/indra/copy_win_scripts/CMakeLists.txt b/indra/copy_win_scripts/CMakeLists.txt
index b1b1006e56..35581e83fe 100644
--- a/indra/copy_win_scripts/CMakeLists.txt
+++ b/indra/copy_win_scripts/CMakeLists.txt
@@ -20,9 +20,9 @@ set(file-list
)
foreach(file ${file-list})
- if(EXISTS ${file})
- set(win_scripts-files ${win_scripts-files} file)
- endif(EXISTS ${file})
+ if(EXISTS ${win_scripts-src}/${file})
+ set(win_scripts-files ${win_scripts-files} ${file})
+ endif(EXISTS ${win_scripts-src}/${file})
endforeach(file ${file-list})
copy_if_different(