Author: cbieneman Date: Mon Jul 25 13:54:30 2016 New Revision: 276674 URL: http://llvm.org/viewvc/llvm-project?rev=276674&view=rev Log: [CMake] Cleaning up some CMake warnings
In Bootstrap builds Clang logs some warnings. These are caused because Clang passes CLANG_STAGE and BOOTSTRAP_DEFAULT_PASSTHROUGH into the next stage's configuration. BOOTSTRAP_DEFAULT_PASSTHROUGH shouldn't be passed, so it is renamed to _BOOTSTRAP_DEFAULT_PASSTHROUGH, to prevent passthrough. CLANG_STAGE should be passed, so I've changed the code to log it if it is set outside the if(CLANG_ENABLE_BOOTSTRAP) block. This makes the variable always used, so the warning goes away. Modified: cfe/trunk/CMakeLists.txt Modified: cfe/trunk/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/CMakeLists.txt?rev=276674&r1=276673&r2=276674&view=diff ============================================================================== --- cfe/trunk/CMakeLists.txt (original) +++ cfe/trunk/CMakeLists.txt Mon Jul 25 13:54:30 2016 @@ -463,12 +463,15 @@ endif() add_subdirectory(cmake/modules) +if(CLANG_STAGE) + message(STATUS "Setting current clang stage to: ${CLANG_STAGE}") +endif() + if (CLANG_ENABLE_BOOTSTRAP) include(ExternalProject) if(NOT CLANG_STAGE) set(CLANG_STAGE stage1) - message(STATUS "Setting current clang stage to: ${CLANG_STAGE}") endif() string(REGEX MATCH "stage([0-9]*)" MATCHED_STAGE "${CLANG_STAGE}") @@ -526,7 +529,7 @@ if (CLANG_ENABLE_BOOTSTRAP) set(verbose -DCMAKE_VERBOSE_MAKEFILE=On) endif() - set(BOOTSTRAP_DEFAULT_PASSTHROUGH + set(_BOOTSTRAP_DEFAULT_PASSTHROUGH PACKAGE_VERSION LLVM_VERSION_MAJOR LLVM_VERSION_MINOR @@ -577,7 +580,7 @@ if (CLANG_ENABLE_BOOTSTRAP) endforeach() # Populate the passthrough variables - foreach(variableName ${CLANG_BOOTSTRAP_PASSTHROUGH} ${BOOTSTRAP_DEFAULT_PASSTHROUGH}) + foreach(variableName ${CLANG_BOOTSTRAP_PASSTHROUGH} ${_BOOTSTRAP_DEFAULT_PASSTHROUGH}) if(${variableName}) string(REPLACE ";" "\;" value ${${variableName}}) list(APPEND PASSTHROUGH_VARIABLES _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits