From 54c674136a33dae33d378f734b174d7ec7ef633b Mon Sep 17 00:00:00 2001 From: Karl Schultz Date: Mon, 8 Jan 2018 18:30:18 -0700 Subject: [PATCH] build: Remove Mock ICD JSON file from install target The mock ICD shouldn't be installed or be part of packages that use the "make install" target to create packages. The mock ICD shared lib wasn't added, but the JSON was. --- icd/CMakeLists.txt | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/icd/CMakeLists.txt b/icd/CMakeLists.txt index 6dfdd92..a7a103d 100644 --- a/icd/CMakeLists.txt +++ b/icd/CMakeLists.txt @@ -72,23 +72,6 @@ add_custom_target(generate_icd_files DEPENDS mock_icd.cpp ) -# Add targets for JSON file install on Linux. -# Need to remove the "./" from the library path before installing to /etc. -if(UNIX) - if(INSTALL_LVL_FILES) - foreach (config_file ${ICD_JSON_FILES}) - add_custom_target(${config_file}-staging-json ALL - COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/staging-json - COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/linux/${config_file}.json ${CMAKE_CURRENT_BINARY_DIR}/staging-json - COMMAND sed -i -e "/\"library_path\":/s$./libVkICD$libVkICD$" ${CMAKE_CURRENT_BINARY_DIR}/staging-json/${config_file}.json - VERBATIM - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/linux/${config_file}.json - ) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/staging-json/${config_file}.json DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/vulkan/icd.d) - endforeach(config_file) - endif() -endif() - if (WIN32) macro(add_vk_icd target) FILE(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/VkICD_${target}.def DEF_FILE) -- 2.7.4