Author: dgregor
Date: Tue Apr 27 11:14:06 2010
New Revision: 102435
URL: http://llvm.org/viewvc/llvm-project?rev=102435&view=rev
Log:
CMake: Fix DESTDIR-related installation problem on Windows, from the
mysterious Elrood on IRC.
Modified:
cfe/trunk/tools/driver/CMakeLists.txt
Modified: cfe/trunk/tools/driver/CMakeLists.txt
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/CMakeLists.txt?rev=102435&r1=102434&r2=102435&view=diff
==============================================================================
--- cfe/trunk/tools/driver/CMakeLists.txt (original)
+++ cfe/trunk/tools/driver/CMakeLists.txt Tue Apr 27 11:14:06 2010
@@ -30,6 +30,7 @@
if(UNIX)
set(CLANGXX_LINK_OR_COPY create_symlink)
+ set(CLANGXX_DESTDIR $ENV{DESTDIR}/)
else()
set(CLANGXX_LINK_OR_COPY copy)
endif()
@@ -45,4 +46,4 @@
RUNTIME DESTINATION bin)
# Create the clang++ symlink at installation time.
-install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E
${CLANGXX_LINK_OR_COPY}
\"${CMAKE_INSTALL_PREFIX}/bin/clang${CMAKE_EXECUTABLE_SUFFIX}\"
\"\$ENV{DESTDIR}/\${CMAKE_INSTALL_PREFIX}/bin/clang++${CMAKE_EXECUTABLE_SUFFIX}\")")
+install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E
${CLANGXX_LINK_OR_COPY}
\"${CMAKE_INSTALL_PREFIX}/bin/clang${CMAKE_EXECUTABLE_SUFFIX}\"
\"${CLANGXX_DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/clang++${CMAKE_EXECUTABLE_SUFFIX}\")")
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
