Skip to content
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

add option to disable installing g3log for project embedding #333

Merged
merged 2 commits into from
Feb 14, 2020
Merged

add option to disable installing g3log for project embedding #333

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
84662d7
add option to disable installing g3log for project embedding
bmagistro Jan 31, 2020
4e029e3
Merge branch 'master' into optional-install
bmagistro Feb 3, 2020
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
59 changes: 31 additions & 28 deletions CPackLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,34 +31,37 @@ SET(CPACK_PACKAGE_CONTACT "Kjell Hedstrom hedstrom@kjellkoc.cc")
SET(CPACK_RESOURCE_FILE_LICENSE ${g3log_SOURCE_DIR}/LICENSE)
SET(CPACK_PACKAGE_VENDOR "KjellKod")

INSTALL( TARGETS g3logger
EXPORT g3logger-targets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)

INSTALL( FILES ${HEADER_FILES}
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/g3log
COMPONENT headers)

INSTALL(
EXPORT g3logger-targets
FILE g3loggerTargets.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/g3logger
)

CONFIGURE_PACKAGE_CONFIG_FILE(
${PROJECT_SOURCE_DIR}/cmake/g3loggerConfig.cmake
${CMAKE_CURRENT_BINARY_DIR}/g3loggerConfig.cmake
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/g3logger
)

install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/g3loggerConfig.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/g3logger
)
IF(INSTALL_G3LOG)
INSTALL( TARGETS g3logger
EXPORT g3logger-targets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT libraries
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)

INSTALL( FILES ${HEADER_FILES}
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/g3log
COMPONENT headers)

INSTALL(
EXPORT g3logger-targets
FILE g3loggerTargets.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/g3logger
)

CONFIGURE_PACKAGE_CONFIG_FILE(
${PROJECT_SOURCE_DIR}/cmake/g3loggerConfig.cmake
${CMAKE_CURRENT_BINARY_DIR}/g3loggerConfig.cmake
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/g3logger
)

install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/g3loggerConfig.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/g3logger
)
ENDIF()


SET(CPACK_COMPONENTS_ALL libraries headers)
SET(CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME "G3Log libraries")
Expand Down
1 change: 1 addition & 0 deletions Options.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ IF (MSVC OR MINGW)
ENDIF (MSVC OR MINGW)
message( STATUS "\n\n\n" )

option(INSTALL_G3LOG "Enable installation of g3logger. (Projects embedding g3logger may want to turn this OFF.)" ON)



Expand Down