Skip to content

Vsg install targets default args #593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robertosfield merged 2 commits into from
Nov 18, 2022
Merged

Vsg install targets default args #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98c9d6e
Added VSG_ profix to INSTALL_TARGETS_DEFAULT_FLAGS
robertosfield Nov 18, 2022
cb2c3cb
Added INSTALL_TARGETS_DEFAULT_FLAGS for backwards compatibility.
robertosfield Nov 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions cmake/vsgMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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()

#
Expand Down
2 changes: 1 addition & 1 deletion src/vsg/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down