mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-31 05:03:22 +08:00
857bccdad0
* Add gazebo11 port * [sdformat9] Use external tinyxml on Windows * Update versions * Use newer vcpkg functions * Fix sdformat9 * Update versions * Try fixing gazebo * Copy extra ogre dlls * Update gazebo ref * Update versions * Fix ogre dll dir * Update version date * Update versions * Update versions * Add licenses * Update versions * Rename to gazebo * Update versions * Update versions * Apply suggestions from code review Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * Update ports/gazebo/portfile.cmake Co-authored-by: Robert Schumacher <roschuma@microsoft.com> * Make pkgconf a host dependency * Update versions * Copy PDBs * Update versions * Change to normal installed directory * Update versions Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
27 lines
1.1 KiB
Diff
27 lines
1.1 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 3dad12e5..e290a3be 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -113,7 +113,7 @@ include (${sdf_cmake_dir}/SDFUtils.cmake)
|
|
|
|
message (STATUS "\n\n====== Finding 3rd Party Packages ======")
|
|
# Use of tinyxml. System installation on UNIX. Internal copy on WIN
|
|
-if (UNIX)
|
|
+if (true)
|
|
message (STATUS "Using system tinyxml")
|
|
set (USE_EXTERNAL_TINYXML True)
|
|
elseif(WIN32)
|
|
diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
|
|
index 427e5e7a..655fafc0 100644
|
|
--- a/cmake/SearchForStuff.cmake
|
|
+++ b/cmake/SearchForStuff.cmake
|
|
@@ -9,7 +9,7 @@ if (USE_EXTERNAL_TINYXML)
|
|
#################################################
|
|
# Find tinyxml. Only debian distributions package tinyxml with a pkg-config
|
|
# Use pkg_check_modules and fallback to manual detection (needed, at least, for MacOS)
|
|
- pkg_check_modules(tinyxml tinyxml)
|
|
+ find_package(tinyxml CONFIG REQUIRED)
|
|
if (NOT tinyxml_FOUND)
|
|
find_path (tinyxml_INCLUDE_DIRS tinyxml.h ${tinyxml_INCLUDE_DIRS} ENV CPATH)
|
|
find_library(tinyxml_LIBRARIES NAMES tinyxml)
|