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

Fix search for UUID on Windows logic #556

Merged
merged 9 commits into from
Nov 20, 2023
Merged

Fix search for UUID on Windows logic #556

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f8a5c3b
Drop the internal vendored version of TinyXML2
mjcarroll Oct 12, 2023
1f4aa08
Update CMakeLists.txt
scpeters Oct 13, 2023
2c535d9
Remove tinyxml2 version < 6 specific logic
mjcarroll Oct 23, 2023
e36e1ab
Merge remote-tracking branch 'origin/mjcarroll/drop_vendor_tinyxml2' …
mjcarroll Oct 23, 2023
6c13100
Merge branch 'main' into mjcarroll/drop_vendor_tinyxml2
mjcarroll Oct 23, 2023
04765c3
Merge branch 'main' into mjcarroll/drop_vendor_tinyxml2
mjcarroll Oct 28, 2023
ad893a2
Fix search for UUID on Windows logic
mjcarroll Nov 9, 2023
f054b07
Merge branch 'main' into mjcarroll/fix_uuid_msvc
mjcarroll Nov 10, 2023
a94d1bd
Merge branch 'main' into mjcarroll/fix_uuid_msvc
mjcarroll Nov 13, 2023
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: 1 addition & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,10 @@ gz_find_package(TINYXML2 PRETTY tinyxml2

#--------------------------------------
# Find dependencies that we ignore for Visual Studio
if(NOT MSVC)

if(NOT WIN32)
#------------------------------------
# Find uuid
gz_find_package(UUID REQUIRED PRETTY uuid)

endif()

#------------------------------------
Expand Down
Loading