From 98c9d6ee0a5121987b952da20bdc7e409f6fe7fc Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 18 Nov 2022 11:52:40 +0000 Subject: [PATCH 1/2] Added VSG_ profix to INSTALL_TARGETS_DEFAULT_FLAGS --- cmake/vsgMacros.cmake | 4 ++-- src/vsg/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/vsgMacros.cmake b/cmake/vsgMacros.cmake index 1d8b29f81f..70a31534b4 100644 --- a/cmake/vsgMacros.cmake +++ b/cmake/vsgMacros.cmake @@ -60,7 +60,7 @@ macro(vsg_setup_dir_vars) # set up local bin directory to place all binaries make_directory(${OUTPUT_BINDIR}) make_directory(${OUTPUT_LIBDIR}) - set(INSTALL_TARGETS_DEFAULT_FLAGS + set(VSG_INSTALL_TARGETS_DEFAULT_FLAGS EXPORT ${PROJECT_NAME}Targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_BINDIR} @@ -71,7 +71,7 @@ macro(vsg_setup_dir_vars) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_LIBDIR}) # set up local bin directory to place all binaries make_directory(${OUTPUT_LIBDIR}) - set(INSTALL_TARGETS_DEFAULT_FLAGS + set(VSG_INSTALL_TARGETS_DEFAULT_FLAGS EXPORT ${PROJECT_NAME}Targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/src/vsg/CMakeLists.txt b/src/vsg/CMakeLists.txt index 75d5beeb07..0c0d699dd1 100644 --- a/src/vsg/CMakeLists.txt +++ b/src/vsg/CMakeLists.txt @@ -450,7 +450,7 @@ if (NOT(${VSG_BINARY_DIR} STREQUAL ${VSG_SOURCE_DIR})) endif() # install lib -install(TARGETS vsg ${INSTALL_TARGETS_DEFAULT_FLAGS}) +install(TARGETS vsg ${VSG_INSTALL_TARGETS_DEFAULT_FLAGS}) # instal cmake config files. install( From cb2c3cbf146d8a97f08d617ba7d627a5902a2f31 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 18 Nov 2022 12:12:12 +0000 Subject: [PATCH 2/2] Added INSTALL_TARGETS_DEFAULT_FLAGS for backwards compatibility. --- cmake/vsgMacros.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/vsgMacros.cmake b/cmake/vsgMacros.cmake index 70a31534b4..cb3ba25b02 100644 --- a/cmake/vsgMacros.cmake +++ b/cmake/vsgMacros.cmake @@ -77,8 +77,11 @@ macro(vsg_setup_dir_vars) LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - ) + ) endif() + + # provide backwards compatibility to VulkanSceneGraph-1.0.0 + set(INSTALL_TARGETS_DEFAULT_FLAGS ${VSG_INSTALL_TARGETS_DEFAULT_FLAGS}) endmacro() #