Skip to content

do not change install destination #3

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

Open
Murmele wants to merge 10 commits into
base: master
Choose a base branch
from
Open

do not change install destination #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8e6cf64
do not change install destination, because dlls are stored then also …
Murmele Jan 31, 2023
b7a419c
Install files only if not FETCH_CONTENT_INCLUSION, because when inclu…
Murmele Mar 2, 2023
4f2069c
include cstdint, because on tumbleweed with gcc13 it does not compile…
Murmele Apr 16, 2023
c1c6844
fix compilation with newer gcc and clang versions
gerlachs Nov 2, 2023
2c1a8e6
Merge pull request #1 from gerlachs/master
Murmele Nov 21, 2023
fa6d02c
make library static
Murmele Jan 27, 2025
976de58
Merge branch 'Technica-Engineering:master' into master
Murmele Jan 27, 2025
d102543
Use docs and tests options to control addition of subdirs to cmake
israelsgalaxy Jan 30, 2025
d7dbfd8
Turn OFF docs generation
israelsgalaxy Jan 30, 2025
5fe16eb
Merge pull request #3 from israelsgalaxy/tmp
Murmele Jan 30, 2025
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
4 changes: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ project(Vector_BLF
DESCRIPTION "Vector Binary Log File support library")

# source code documentation
option(OPTION_RUN_DOXYGEN "Run Doxygen" ON)
option(OPTION_RUN_DOXYGEN "Run Doxygen" OFF)

# static code analysis
option(OPTION_RUN_CCCC "Run CCCC" OFF)
Expand All @@ -21,6 +21,8 @@ option(OPTION_BUILD_TESTS "Build tests" OFF)
option(OPTION_USE_GCOV "Build with gcov to generate coverage data on execution" OFF)
option(OPTION_USE_GPROF "Build with gprof" OFF)
option(OPTION_ADD_LCOV "Add lcov targets to generate HTML coverage report" OFF)
# Turn OFF, if you are using FetchContent to include it to your project
option(FETCH_CONTENT_INCLUSION "Include project with FetchContent_Declare in another project. In this case the headers and the cmake files are not needed, only the library" OFF)

# directories
include(GNUInstallDirs)
Expand Down
35 changes: 21 additions & 14 deletions src/Vector/BLF/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
include(GenerateExportHeader)

# targets
add_library(${PROJECT_NAME} SHARED "")
add_library(${PROJECT_NAME} STATIC "")

# search paths
include_directories(
Expand Down Expand Up @@ -341,18 +341,25 @@ endif()

# install
install(
TARGETS ${PROJECT_NAME}
DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
install(
FILES
${CMAKE_CURRENT_BINARY_DIR}/vector_blf_export.h
${CMAKE_CURRENT_BINARY_DIR}/config.h
$<TARGET_PROPERTY:${PROJECT_NAME},INTERFACE_SOURCES>
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Vector/BLF)
TARGETS ${PROJECT_NAME})

if (NOT FETCH_CONTENT_INCLUSION)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
install(
FILES
${CMAKE_CURRENT_BINARY_DIR}/vector_blf_export.h
${CMAKE_CURRENT_BINARY_DIR}/config.h
$<TARGET_PROPERTY:${PROJECT_NAME},INTERFACE_SOURCES>
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Vector/BLF)
endif()

# sub directories
add_subdirectory(docs)
add_subdirectory(tests)
if (OPTION_RUN_DOXYGEN)
add_subdirectory(docs)
endif()

if (OPTION_BUILD_TESTS)
add_subdirectory(tests)
endif()
2 changes: 2 additions & 0 deletions src/Vector/BLF/ObjectHeaderBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

#include <Vector/BLF/platform.h>

#include <cstdint>

#include <Vector/BLF/AbstractFile.h>

#include <Vector/BLF/vector_blf_export.h>
Expand Down
1 change: 1 addition & 0 deletions src/Vector/BLF/platform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#pragma once

#include <Vector/BLF/config.h>
#include <cstdint>

/* GCC */
#ifdef __GNUC__
Expand Down
8 changes: 5 additions & 3 deletions src/Vector/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

add_subdirectory(BLF)

install(
FILES BLF.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Vector)
if (NOT FETCH_CONTENT_INCLUSION)
install(
FILES BLF.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Vector)
endif()