[cfe-commits] r79827 - in /cfe/trunk: CMakeLists.txt lib/Headers/CMakeLists.txt tools/clang-cc/CMakeLists.txt tools/driver/CMakeLists.txt

[Douglas Gregor]

Author: dgregor
Date: Sun Aug 23 00:28:29 2009
New Revision: 79827

URL: http://llvm.org/viewvc/llvm-project?rev=79827&view=rev
Log:
CMake: Improve installation of Clang

  - Install clang-cc into libexec
  - Install headers into lib/clang/<version>/include
  - Don't install other clang-based tools (clang-wpa, clang-index, etc.)


Modified:
    cfe/trunk/CMakeLists.txt
    cfe/trunk/lib/Headers/CMakeLists.txt
    cfe/trunk/tools/clang-cc/CMakeLists.txt
    cfe/trunk/tools/driver/CMakeLists.txt

Modified: cfe/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/CMakeLists.txt?rev=79827&r1=79826&r2=79827&view=diff

==============================================================================
--- cfe/trunk/CMakeLists.txt (original)
+++ cfe/trunk/CMakeLists.txt Sun Aug 23 00:28:29 2009
@@ -1,3 +1,6 @@
+# Clang version information
+set(CLANG_VERSION 1.0)
+
 macro(add_clang_library name)
   set(srcs ${ARGN})
   if(MSVC_IDE OR XCODE)
@@ -36,8 +39,6 @@
     set(srcs ${srcs} ${headers})
   endif(MSVC_IDE)
   add_llvm_executable( ${name} ${srcs} )
-  install(TARGETS ${name}
-    RUNTIME DESTINATION bin)
 endmacro(add_clang_executable)
 
 include_directories(

Modified: cfe/trunk/lib/Headers/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Headers/CMakeLists.txt?rev=79827&r1=79826&r2=79827&view=diff

==============================================================================
--- cfe/trunk/lib/Headers/CMakeLists.txt (original)
+++ cfe/trunk/lib/Headers/CMakeLists.txt Sun Aug 23 00:28:29 2009
@@ -14,11 +14,10 @@
   tmmintrin.h
   xmmintrin.h)
 
-#FIXME: Centralize Clang version info
 if (MSVC_IDE OR XCODE)
-  set(output_dir ${LLVM_BINARY_DIR}/bin/lib/clang/1.0/include)
+  set(output_dir ${LLVM_BINARY_DIR}/bin/lib/clang/${CLANG_VERSION}/include)
 else ()
-  set(output_dir ${LLVM_BINARY_DIR}/lib/clang/1.0/include)
+  set(output_dir ${LLVM_BINARY_DIR}/lib/clang/${CLANG_VERSION}/include)
 endif ()
 
 
@@ -36,4 +35,4 @@
 
 install(FILES ${files}
   PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
-  DESTINATION Headers)
+  DESTINATION lib/clang/${CLANG_VERSION}/include)

Modified: cfe/trunk/tools/clang-cc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-cc/CMakeLists.txt?rev=79827&r1=79826&r2=79827&view=diff

==============================================================================
--- cfe/trunk/tools/clang-cc/CMakeLists.txt (original)
+++ cfe/trunk/tools/clang-cc/CMakeLists.txt Sun Aug 23 00:28:29 2009
@@ -25,3 +25,6 @@
   clang-cc.cpp
   )
 add_dependencies(clang-cc clang-headers)
+
+install(TARGETS clang-cc
+  RUNTIME DESTINATION libexec)

Modified: cfe/trunk/tools/driver/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/driver/CMakeLists.txt?rev=79827&r1=79826&r2=79827&view=diff

==============================================================================
--- cfe/trunk/tools/driver/CMakeLists.txt (original)
+++ cfe/trunk/tools/driver/CMakeLists.txt Sun Aug 23 00:28:29 2009
@@ -13,3 +13,5 @@
 
 add_dependencies(clang clang-cc)
 
+install(TARGETS clang
+  RUNTIME DESTINATION bin)