This revision was landed with ongoing or failed builds. This revision was automatically updated to reflect the committed changes. Closed by commit rG4e4ab8e0152b: [clang] Limit scope of CLANG_VENDOR definition (authored by smeenai).
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D90516/new/ https://reviews.llvm.org/D90516 Files: clang/CMakeLists.txt clang/lib/Basic/CMakeLists.txt Index: clang/lib/Basic/CMakeLists.txt =================================================================== --- clang/lib/Basic/CMakeLists.txt +++ clang/lib/Basic/CMakeLists.txt @@ -33,6 +33,11 @@ PROPERTIES GENERATED TRUE HEADER_FILE_ONLY TRUE) +if(CLANG_VENDOR) + set_source_files_properties(Version.cpp + PROPERTIES COMPILE_DEFINITIONS "CLANG_VENDOR=\"${CLANG_VENDOR} \"") +endif() + add_clang_library(clangBasic Attributes.cpp Builtins.cpp Index: clang/CMakeLists.txt =================================================================== --- clang/CMakeLists.txt +++ clang/CMakeLists.txt @@ -332,10 +332,6 @@ set(CLANG_VENDOR ${PACKAGE_VENDOR} CACHE STRING "Vendor-specific text for showing with version information.") -if( CLANG_VENDOR ) - add_definitions( -DCLANG_VENDOR="${CLANG_VENDOR} " ) -endif() - set(CLANG_REPOSITORY_STRING "" CACHE STRING "Vendor-specific text for showing the repository the source is taken from.")
Index: clang/lib/Basic/CMakeLists.txt =================================================================== --- clang/lib/Basic/CMakeLists.txt +++ clang/lib/Basic/CMakeLists.txt @@ -33,6 +33,11 @@ PROPERTIES GENERATED TRUE HEADER_FILE_ONLY TRUE) +if(CLANG_VENDOR) + set_source_files_properties(Version.cpp + PROPERTIES COMPILE_DEFINITIONS "CLANG_VENDOR=\"${CLANG_VENDOR} \"") +endif() + add_clang_library(clangBasic Attributes.cpp Builtins.cpp Index: clang/CMakeLists.txt =================================================================== --- clang/CMakeLists.txt +++ clang/CMakeLists.txt @@ -332,10 +332,6 @@ set(CLANG_VENDOR ${PACKAGE_VENDOR} CACHE STRING "Vendor-specific text for showing with version information.") -if( CLANG_VENDOR ) - add_definitions( -DCLANG_VENDOR="${CLANG_VENDOR} " ) -endif() - set(CLANG_REPOSITORY_STRING "" CACHE STRING "Vendor-specific text for showing the repository the source is taken from.")
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits