Skip to content

Add Installation Paths Fix #65

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
merged 4 commits into from
Feb 20, 2025
Merged

Add Installation Paths Fix #65

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcc669c
Adding initial code changes that fixes the issue.
OliverGlandberger Jan 28, 2025
3302137
Update before testing.
OliverGlandberger Feb 18, 2025
7ef71ab
Reorder code.
OliverGlandberger Feb 18, 2025
1f3dc79
Fixed conflicts and made minor updates. Removed '/include' which is i…
OliverGlandberger Feb 20, 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
26 changes: 13 additions & 13 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ endif()

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")

include(GNUInstallDirs)

add_library(${PROJECT_NAME} ${LIB_TYPE}
Network.cpp
RTPacket.cpp
Expand All @@ -40,16 +42,16 @@ add_library(${PROJECT_NAME} ${LIB_TYPE}

target_include_directories(${PROJECT_NAME}
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}>
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>"
"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}>"
PRIVATE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/External/tinyxml2
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/External/tinyxml2"
)

target_link_libraries(${PROJECT_NAME}
PUBLIC
$<$<STREQUAL:$<PLATFORM_ID>,Windows>:ws2_32>
$<$<STREQUAL:$<PLATFORM_ID>,Windows>:iphlpapi>
"$<$<STREQUAL:$<PLATFORM_ID>,Windows>:ws2_32>"
"$<$<STREQUAL:$<PLATFORM_ID>,Windows>:iphlpapi>"
)

# Enable C++14
Expand Down Expand Up @@ -89,8 +91,6 @@ endif()

# ----------- INSTALL & EXPORT -----------

include(GNUInstallDirs)

set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME})

install(EXPORT ${PROJECT_NAME}Targets
Expand All @@ -106,17 +106,17 @@ configure_package_config_file(${PROJECT_NAME}Config.cmake.in
)

install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
DESTINATION ${ConfigPackageLocation}
DESTINATION ${ConfigPackageLocation}
)

# 'make install' to the correct locations (provided by GNUInstallDirs).
# 'make install' to the correct locations (provided by GNUInstallDirs)
install(
TARGETS ${PROJECT_NAME}
EXPORT ${PROJECT_NAME}Targets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} # This is for Windows
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" # This is for Windows
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}"
)

# Copy along headers
Expand Down
Loading