Author: cbieneman
Date: Fri Jun 24 15:21:12 2016
New Revision: 273714
URL: http://llvm.org/viewvc/llvm-project?rev=273714&view=rev
Log:
[CMake] Remove CLANG_APPEND_VC_REV option
I added this option in r257827 to try and add compatibility with autoconf. At
the time I misunderstood the problem.
Our CMake automatically generates the SVN revision information and generates a
build action to update it so builds don't need to be re-configured on SCM
update (which is a better solution than we had in autoconf).
The problem I was actually seeing was isolated cases where SVN revision
information isn't available because the repository structures have been
removed. This happens in some automated testing systems.
This patch allows SVN_REVISION to be overridden if the build configuration
could not find the SCM repository structures, and removes the code from my
original patch because it is unnecessary.
Modified:
cfe/trunk/CMakeLists.txt
cfe/trunk/lib/Basic/CMakeLists.txt
Modified: cfe/trunk/CMakeLists.txt
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/CMakeLists.txt?rev=273714&r1=273713&r2=273714&view=diff
==============================================================================
--- cfe/trunk/CMakeLists.txt (original)
+++ cfe/trunk/CMakeLists.txt Fri Jun 24 15:21:12 2016
@@ -214,19 +214,6 @@ if(CLANG_REPOSITORY_STRING)
add_definitions(-DCLANG_REPOSITORY_STRING="${CLANG_REPOSITORY_STRING}")
endif()
-option(CLANG_APPEND_VC_REV
- "Append the version control system revision id to clang version spew" OFF)
-if(CLANG_APPEND_VC_REV)
- if(NOT SVN_REVISION)
- # This macro will set SVN_REVISION in the parent scope
- add_version_info_from_vcs(VERSION_VAR)
- endif()
-
- if(SVN_REVISION)
- add_definitions(-DSVN_REVISION="${SVN_REVISION}")
- endif()
-endif()
-
set(CLANG_VENDOR_UTI "org.llvm.clang" CACHE STRING
"Vendor-specific uti.")
Modified: cfe/trunk/lib/Basic/CMakeLists.txt
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/CMakeLists.txt?rev=273714&r1=273713&r2=273714&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/CMakeLists.txt (original)
+++ cfe/trunk/lib/Basic/CMakeLists.txt Fri Jun 24 15:21:12 2016
@@ -53,6 +53,13 @@ if(DEFINED llvm_vc AND DEFINED clang_vc)
else()
# Not producing a VC revision include.
set(version_inc)
+
+ # Being able to force-set the SVN revision in cases where it isn't available
+ # is useful for performance tracking, and matches compatibility from
autoconf.
+ if(SVN_REVISION)
+ set_source_files_properties(Version.cpp
+ PROPERTIES COMPILE_DEFINITIONS "SVN_REVISION=\"${SVN_REVISION}\"")
+ endif()
endif()
add_clang_library(clangBasic
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
