diff --git a/cmake/vsgMacros.cmake b/cmake/vsgMacros.cmake index 1d8b29f81f..cb3ba25b02 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,14 +71,17 @@ 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} 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() # 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(