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

Change So That Tinyxml2 Is Integrated Using Git Submodule #67

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −17
Open

Change So That Tinyxml2 Is Integrated Using Git Submodule #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "external/tinyxml2"]
path = external/tinyxml2
url = https://github.com/leethomason/tinyxml2.git
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we specify the v10.0.0 release branch here instead of just "latest from master"?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems like a good idea

3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ install(
CODE "file( INSTALL \${HEADERS} DESTINATION \"${INSTALL_INCLUDE_DIR}\" )"
)

add_subdirectory(external/tinyxml2)

# ----------- EXAMPLES -----------

# example: RigidBodyStreaming
Expand All @@ -79,6 +81,7 @@ if (${PROJECT_NAME}_BUILD_EXAMPLES)
)
target_link_libraries(RigidBodyStreaming
qualisys_cpp_sdk
tinyxml2
)
endif ()

Expand Down
3 changes: 1 addition & 2 deletions Tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.27.1)

project(qualisys_cpp_sdk_tests LANGUAGES CXX)

include(tinyxml2)
include(doctest)

set(SOURCE_LIST
Expand Down Expand Up @@ -33,7 +32,7 @@ target_link_libraries(${PROJECT_NAME}
PRIVATE
qualisys_cpp_sdk
doctest::doctest
tinyxml2::tinyxml2
tinyxml2
)

target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_17)
Expand Down
15 changes: 0 additions & 15 deletions cmake/tinyxml2.cmake
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions external/tinyxml2
Open in desktop
Submodule tinyxml2 added at 57ec94