This revision was automatically updated to reflect the committed changes. Closed by commit rGd3ce1339264d: [clang] Do not override libclang.so's SOVERSION if… (authored by mgorny). Herald added a project: clang.
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D135701/new/ https://reviews.llvm.org/D135701 Files: clang/tools/libclang/CMakeLists.txt Index: clang/tools/libclang/CMakeLists.txt =================================================================== --- clang/tools/libclang/CMakeLists.txt +++ clang/tools/libclang/CMakeLists.txt @@ -9,10 +9,9 @@ # TODO: This should probably not be a option going forward but we # we should commit to a way to do it. But due to getting this out # in LLVM 15.x we opted for a option. +set(LIBCLANG_SOVERSION_ARG) if(NOT CLANG_FORCE_MATCHING_LIBCLANG_SOVERSION) - set(LIBCLANG_SOVERSION 13) -else() - set(LIBCLANG_SOVERSION ${CLANG_VERSION_MAJOR}) + set(LIBCLANG_SOVERSION_ARG SOVERSION 13) endif() # TODO: harmonize usage of LIBCLANG_SOVERSION / LIBCLANG_LIBARY_VERSION @@ -195,7 +194,7 @@ set_target_properties(libclang PROPERTIES VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX} - SOVERSION ${LIBCLANG_SOVERSION}) + ${LIBCLANG_SOVERSION_ARG}) endif() endif()
Index: clang/tools/libclang/CMakeLists.txt =================================================================== --- clang/tools/libclang/CMakeLists.txt +++ clang/tools/libclang/CMakeLists.txt @@ -9,10 +9,9 @@ # TODO: This should probably not be a option going forward but we # we should commit to a way to do it. But due to getting this out # in LLVM 15.x we opted for a option. +set(LIBCLANG_SOVERSION_ARG) if(NOT CLANG_FORCE_MATCHING_LIBCLANG_SOVERSION) - set(LIBCLANG_SOVERSION 13) -else() - set(LIBCLANG_SOVERSION ${CLANG_VERSION_MAJOR}) + set(LIBCLANG_SOVERSION_ARG SOVERSION 13) endif() # TODO: harmonize usage of LIBCLANG_SOVERSION / LIBCLANG_LIBARY_VERSION @@ -195,7 +194,7 @@ set_target_properties(libclang PROPERTIES VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX} - SOVERSION ${LIBCLANG_SOVERSION}) + ${LIBCLANG_SOVERSION_ARG}) endif() endif()
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits