Skip to content

Fix install #20

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
OliverBenz merged 2 commits into from
Dec 26, 2025
Merged

Fix install #20

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
db71349
CMake: Improvements installation
OliverBenz Dec 26, 2025
e7a2936
CMake: Fix ide directory.
OliverBenz Dec 26, 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
19 changes: 3 additions & 16 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,6 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
set(LOGGER_IS_TOP_LEVEL ON)
endif()

# Normalize install prefix for Unix-like systems (prefer /opt).
if(UNIX AND NOT WIN32)
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT OR CMAKE_INSTALL_PREFIX MATCHES "^/var/empty")
set(CMAKE_INSTALL_PREFIX "/opt" CACHE PATH "Install path prefix" FORCE)
endif()
endif()

# Project Options
option(LOGGER_BUILD_TESTS "Build Logger unit tests" ${LOGGER_IS_TOP_LEVEL})
option(LOGGER_BUILD_EXAMPLES "Build Logger examples" ${LOGGER_IS_TOP_LEVEL})
Expand Down Expand Up @@ -54,24 +47,18 @@ endif()
configure_package_config_file(
${CMAKE_CURRENT_SOURCE_DIR}/cmake/LoggerConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/LoggerConfig.cmake
INSTALL_DESTINATION ${LOGGER_INSTALL_BASE}/lib/cmake
INSTALL_DESTINATION ${LOGGER_INSTALL_BASE}/${CMAKE_INSTALL_LIBDIR}/cmake/Logger
)
write_basic_package_version_file(
${CMAKE_CURRENT_BINARY_DIR}/LoggerConfigVersion.cmake
VERSION ${PROJECT_VERSION}
COMPATIBILITY SameMajorVersion
)

export(
EXPORT LoggerTargets
FILE ${CMAKE_CURRENT_BINARY_DIR}/LoggerTargets.cmake
NAMESPACE Logger::
)

if(LOGGER_ENABLE_INSTALL)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/LoggerConfig.cmake
${CMAKE_CURRENT_BINARY_DIR}/LoggerConfigVersion.cmake
DESTINATION ${LOGGER_INSTALL_BASE}/lib/cmake
DESTINATION ${LOGGER_INSTALL_BASE}/${CMAKE_INSTALL_LIBDIR}/cmake/Logger
)
endif()
endif()
8 changes: 4 additions & 4 deletions lib/FetchLibraries.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ FetchContent_Declare(
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) # For Windows: Prevent overriding the parent project's compiler/linker settings

FetchContent_MakeAvailable(googletest)
set_target_properties(gtest PROPERTIES FOLDER "${ideFolderExternal}")
set_target_properties(gtest_main PROPERTIES FOLDER "${ideFolderExternal}")
set_target_properties(gmock PROPERTIES FOLDER "${ideFolderExternal}")
set_target_properties(gmock_main PROPERTIES FOLDER "${ideFolderExternal}")
set_target_properties(gtest PROPERTIES FOLDER "${IDE_FOLDER_EXTERNAL}")
set_target_properties(gtest_main PROPERTIES FOLDER "${IDE_FOLDER_EXTERNAL}")
set_target_properties(gmock PROPERTIES FOLDER "${IDE_FOLDER_EXTERNAL}")
set_target_properties(gmock_main PROPERTIES FOLDER "${IDE_FOLDER_EXTERNAL}")
15 changes: 6 additions & 9 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,15 @@ target_compile_features(${targetName} PUBLIC cxx_std_20)
target_include_directories(${targetName}
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
$<INSTALL_INTERFACE:${LOGGER_INSTALL_BASE}/include/Logger>
$<INSTALL_INTERFACE:include/Logger>
)
set_target_properties(${targetName} PROPERTIES FOLDER "${IDE_FOLDER_SOURCE}")
set_target_properties(${targetName} PROPERTIES FOLDER "${IDE_FOLDER_SOURCE}" EXPORT_NAME Logger)

# Setup project settings
set_project_warnings(${targetName}) # Which warnings to enable
set_compile_options(${targetName}) # Which extra compiler flags to enable
set_output_directory(${targetName}) # Set the output directory of the library

# Copy header files to output after build
copy_headers_to_output("${targetName}" "${headers}" "Logger")

# Specify version
target_compile_definitions(${targetName} PUBLIC LOGVERSION_MAJOR=1)
target_compile_definitions(${targetName} PUBLIC LOGVERSION_MINOR=0)
Expand All @@ -36,9 +33,9 @@ target_compile_definitions(${targetName} PUBLIC LOGVERSION_PATCH=0)
if(LOGGER_ENABLE_INSTALL)
install(TARGETS ${targetName}
EXPORT LoggerTargets
ARCHIVE DESTINATION ${LOGGER_INSTALL_BASE}/lib/${LOGGER_INSTALL_ARCH}/${LOGGER_INSTALL_CONFIG}
LIBRARY DESTINATION ${LOGGER_INSTALL_BASE}/lib/${LOGGER_INSTALL_ARCH}/${LOGGER_INSTALL_CONFIG}
RUNTIME DESTINATION ${LOGGER_INSTALL_BASE}/bin/${LOGGER_INSTALL_ARCH}/${LOGGER_INSTALL_CONFIG}
ARCHIVE DESTINATION ${LOGGER_INSTALL_BASE}/${CMAKE_INSTALL_LIBDIR}/${LOGGER_INSTALL_ARCH}/${LOGGER_INSTALL_CONFIG}
LIBRARY DESTINATION ${LOGGER_INSTALL_BASE}/${CMAKE_INSTALL_LIBDIR}/${LOGGER_INSTALL_ARCH}/${LOGGER_INSTALL_CONFIG}
RUNTIME DESTINATION ${LOGGER_INSTALL_BASE}/${CMAKE_INSTALL_BINDIR}/${LOGGER_INSTALL_ARCH}/${LOGGER_INSTALL_CONFIG}
)
install(
DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/include/Logger
Expand All @@ -47,6 +44,6 @@ if(LOGGER_ENABLE_INSTALL)
install(EXPORT LoggerTargets
FILE LoggerTargets.cmake
NAMESPACE Logger::
DESTINATION ${LOGGER_INSTALL_BASE}/lib/cmake
DESTINATION ${LOGGER_INSTALL_BASE}/${CMAKE_INSTALL_LIBDIR}/cmake/Logger
)
endif()
Loading