From: Jan Engelhardt Date: 2016-06-13 11:46:16.846841814 +0200 Unversioned libraries suck! --- source/CMakeLists.txt | 2 ++ source/diff/CMakeLists.txt | 1 + source/fuzz/CMakeLists.txt | 1 + source/link/CMakeLists.txt | 1 + source/lint/CMakeLists.txt | 1 + source/opt/CMakeLists.txt | 1 + source/reduce/CMakeLists.txt | 1 + 7 files changed, 8 insertions(+) Index: SPIRV-Tools-sdk-1.3.216.0/source/CMakeLists.txt =================================================================== --- SPIRV-Tools-sdk-1.3.216.0.orig/source/CMakeLists.txt +++ SPIRV-Tools-sdk-1.3.216.0/source/CMakeLists.txt @@ -377,6 +377,7 @@ endfunction() add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES}) spirv_tools_default_target_options(${SPIRV_TOOLS}-shared) set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES CXX_VISIBILITY_PRESET hidden) +set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES OUTPUT_NAME "${SPIRV_TOOLS}-shared-@PACKAGE_VERSION@") target_compile_definitions(${SPIRV_TOOLS}-shared PRIVATE SPIRV_TOOLS_IMPLEMENTATION PUBLIC SPIRV_TOOLS_SHAREDLIB @@ -399,6 +400,7 @@ if(SPIRV_TOOLS_BUILD_STATIC) set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static ${SPIRV_TOOLS}-shared) else() add_library(${SPIRV_TOOLS} ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_SOURCES}) + set_target_properties(${SPIRV_TOOLS} PROPERTIES OUTPUT_NAME "${SPIRV_TOOLS}-@PACKAGE_VERSION@") spirv_tools_default_target_options(${SPIRV_TOOLS}) set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS} ${SPIRV_TOOLS}-shared) endif() Index: SPIRV-Tools-sdk-1.3.216.0/source/diff/CMakeLists.txt =================================================================== --- SPIRV-Tools-sdk-1.3.216.0.orig/source/diff/CMakeLists.txt +++ SPIRV-Tools-sdk-1.3.216.0/source/diff/CMakeLists.txt @@ -36,6 +36,7 @@ target_link_libraries(SPIRV-Tools-diff PUBLIC SPIRV-Tools-opt) set_property(TARGET SPIRV-Tools-diff PROPERTY FOLDER "SPIRV-Tools libraries") +set_target_properties(SPIRV-Tools-diff PROPERTIES OUTPUT_NAME "SPIRV-Tools-diff-@PACKAGE_VERSION@") spvtools_check_symbol_exports(SPIRV-Tools-diff) if(ENABLE_SPIRV_TOOLS_INSTALL) Index: SPIRV-Tools-sdk-1.3.216.0/source/fuzz/CMakeLists.txt =================================================================== --- SPIRV-Tools-sdk-1.3.216.0.orig/source/fuzz/CMakeLists.txt +++ SPIRV-Tools-sdk-1.3.216.0/source/fuzz/CMakeLists.txt @@ -439,6 +439,7 @@ if(SPIRV_BUILD_FUZZER) spvtools_pch(SPIRV_TOOLS_FUZZ_SOURCES pch_source_fuzz) add_library(SPIRV-Tools-fuzz ${SPIRV_TOOLS_FUZZ_SOURCES}) + set_target_properties(SPIRV-Tools-fuzz PROPERTIES OUTPUT_NAME "SPIRV-Tools-fuzz-@PACKAGE_VERSION@") spvtools_default_compile_options(SPIRV-Tools-fuzz) Index: SPIRV-Tools-sdk-1.3.216.0/source/link/CMakeLists.txt =================================================================== --- SPIRV-Tools-sdk-1.3.216.0.orig/source/link/CMakeLists.txt +++ SPIRV-Tools-sdk-1.3.216.0/source/link/CMakeLists.txt @@ -14,6 +14,7 @@ add_library(SPIRV-Tools-link ${SPIRV_TOOLS_LIBRARY_TYPE} linker.cpp ) +set_target_properties(SPIRV-Tools-link PROPERTIES OUTPUT_NAME "SPIRV-Tools-link-@PACKAGE_VERSION@") spvtools_default_compile_options(SPIRV-Tools-link) target_include_directories(SPIRV-Tools-link Index: SPIRV-Tools-sdk-1.3.216.0/source/lint/CMakeLists.txt =================================================================== --- SPIRV-Tools-sdk-1.3.216.0.orig/source/lint/CMakeLists.txt +++ SPIRV-Tools-sdk-1.3.216.0/source/lint/CMakeLists.txt @@ -27,6 +27,7 @@ endif() add_library(SPIRV-Tools-lint ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_TOOLS_LINT_SOURCES}) +set_target_properties(SPIRV-Tools-lint PROPERTIES OUTPUT_NAME "SPIRV-Tools-lint-@PACKAGE_VERSION@") spvtools_default_compile_options(SPIRV-Tools-lint) target_include_directories(SPIRV-Tools-lint PUBLIC Index: SPIRV-Tools-sdk-1.3.216.0/source/opt/CMakeLists.txt =================================================================== --- SPIRV-Tools-sdk-1.3.216.0.orig/source/opt/CMakeLists.txt +++ SPIRV-Tools-sdk-1.3.216.0/source/opt/CMakeLists.txt @@ -249,6 +249,7 @@ spvtools_pch(SPIRV_TOOLS_OPT_SOURCES pch add_library(SPIRV-Tools-opt ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_TOOLS_OPT_SOURCES}) +set_target_properties(SPIRV-Tools-opt PROPERTIES OUTPUT_NAME "SPIRV-Tools-opt-@PACKAGE_VERSION@") spvtools_default_compile_options(SPIRV-Tools-opt) target_include_directories(SPIRV-Tools-opt PUBLIC Index: SPIRV-Tools-sdk-1.3.216.0/source/reduce/CMakeLists.txt =================================================================== --- SPIRV-Tools-sdk-1.3.216.0.orig/source/reduce/CMakeLists.txt +++ SPIRV-Tools-sdk-1.3.216.0/source/reduce/CMakeLists.txt @@ -92,6 +92,7 @@ target_include_directories(SPIRV-Tools-r $ PRIVATE ${spirv-tools_BINARY_DIR} ) +set_target_properties(SPIRV-Tools-reduce PROPERTIES OUTPUT_NAME "SPIRV-Tools-reduce-@PACKAGE_VERSION@") # The reducer reuses a lot of functionality from the SPIRV-Tools library. target_link_libraries(SPIRV-Tools-reduce PUBLIC ${SPIRV_TOOLS_FULL_VISIBILITY}