From fcc669c10b0cb98464f402ac6c0d4ed74bdc5d85 Mon Sep 17 00:00:00 2001 From: Oliver Glandberger Date: Tue, 28 Jan 2025 11:44:49 +0100 Subject: [PATCH 1/4] Adding initial code changes that fixes the issue. --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a2c5f5..6388eeb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required(VERSION 3.8) project(qualisys_cpp_sdk VERSION 1.0.0) +include(GNUInstallDirs) + option(${PROJECT_NAME}_BUILD_EXAMPLES "Build examples" OFF) option(${PROJECT_NAME}_BUILD_TESTS "Build tests" OFF) @@ -106,7 +108,7 @@ 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). From 3302137b830298d6f3f9f23a88e265ef71f8de63 Mon Sep 17 00:00:00 2001 From: Oliver Glandberger Date: Tue, 18 Feb 2025 10:46:19 +0100 Subject: [PATCH 2/4] Update before testing. --- CMakeLists.txt | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6388eeb..6775725 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,16 +42,16 @@ add_library(${PROJECT_NAME} ${LIB_TYPE} target_include_directories(${PROJECT_NAME} PUBLIC - $ - $ + "$" + "$" PRIVATE - $/External/tinyxml2 + "$/External/tinyxml2" ) target_link_libraries(${PROJECT_NAME} PUBLIC - $<$,Windows>:ws2_32> - $<$,Windows>:iphlpapi> + "$<$,Windows>:ws2_32>" + "$<$,Windows>:iphlpapi>" ) # Enable C++14 @@ -91,10 +91,18 @@ endif() # ----------- INSTALL & EXPORT ----------- -include(GNUInstallDirs) - set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}) +# '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}" +) + install(EXPORT ${PROJECT_NAME}Targets FILE ${PROJECT_NAME}Targets.cmake DESTINATION ${ConfigPackageLocation} @@ -111,16 +119,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake DESTINATION ${ConfigPackageLocation} ) -# '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} -) - # Copy along headers set(INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}") install( From 7ef71ab660898f2bf5ff0b50c656d4d227a1fec8 Mon Sep 17 00:00:00 2001 From: Oliver Glandberger Date: Tue, 18 Feb 2025 10:54:01 +0100 Subject: [PATCH 3/4] Reorder code. --- CMakeLists.txt | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6775725..27e9825 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,6 @@ cmake_minimum_required(VERSION 3.8) project(qualisys_cpp_sdk VERSION 1.0.0) -include(GNUInstallDirs) - option(${PROJECT_NAME}_BUILD_EXAMPLES "Build examples" OFF) option(${PROJECT_NAME}_BUILD_TESTS "Build tests" OFF) @@ -93,16 +91,6 @@ endif() set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}) -# '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}" -) - install(EXPORT ${PROJECT_NAME}Targets FILE ${PROJECT_NAME}Targets.cmake DESTINATION ${ConfigPackageLocation} @@ -119,6 +107,16 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake DESTINATION ${ConfigPackageLocation} ) +# '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}" +) + # Copy along headers set(INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}") install( From 1f3dc79321b3cbe1b417f44d32d3220cdf5fdd8f Mon Sep 17 00:00:00 2001 From: Oliver Glandberger Date: Thu, 20 Feb 2025 15:17:56 +0100 Subject: [PATCH 4/4] Fixed conflicts and made minor updates. Removed '/include' which is incorrect with newest changes. --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 27e9825..db86098 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 @@ -40,7 +42,7 @@ add_library(${PROJECT_NAME} ${LIB_TYPE} target_include_directories(${PROJECT_NAME} PUBLIC - "$" + "$" "$" PRIVATE "$/External/tinyxml2"