early-access version 2853
This commit is contained in:
pineappleEA
35
externals/vcpkg/ports/sdformat9/fix-dependency-urdfdom.patch
vendored
Executable file
35
externals/vcpkg/ports/sdformat9/fix-dependency-urdfdom.patch
vendored
Executable file
@@ -0,0 +1,35 @@
|
||||
diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
|
||||
index 427e5e7..af31df4 100644
|
||||
--- a/cmake/SearchForStuff.cmake
|
||||
+++ b/cmake/SearchForStuff.cmake
|
||||
@@ -43,7 +43,7 @@ endif()
|
||||
# 2. if USE_INTERNAL_URDF is set to True, use the internal copy
|
||||
# 3. if USE_INTERNAL_URDF is set to False, force to search system installation, fail on error
|
||||
|
||||
-if (NOT PKG_CONFIG_FOUND)
|
||||
+if (0)
|
||||
if (NOT DEFINED USE_INTERNAL_URDF)
|
||||
BUILD_WARNING("Couldn't find pkg-config for urdfdom, using internal copy")
|
||||
set(USE_INTERNAL_URDF true)
|
||||
@@ -53,10 +53,9 @@ if (NOT PKG_CONFIG_FOUND)
|
||||
endif()
|
||||
|
||||
if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF)
|
||||
- # check for urdfdom with pkg-config
|
||||
- pkg_check_modules(URDF urdfdom>=1.0)
|
||||
+ find_package(urdfdom CONFIG REQUIRED)
|
||||
|
||||
- if (NOT URDF_FOUND)
|
||||
+ if (NOT urdfdom_FOUND)
|
||||
find_package(urdfdom)
|
||||
if (urdfdom_FOUND)
|
||||
set(URDF_INCLUDE_DIRS ${urdfdom_INCLUDE_DIRS})
|
||||
@@ -73,6 +72,7 @@ if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF)
|
||||
# what am I doing here? pkg-config and cmake
|
||||
- set(URDF_INCLUDE_DIRS ${URDF_INCLUDEDIR})
|
||||
set(URDF_LIBRARY_DIRS ${URDF_LIBDIR})
|
||||
+ set(URDF_INCLUDE_DIRS ${urdfdom_INCLUDE_DIRS})
|
||||
+ set(URDF_LIBRARIES ${urdfdom_LIBRARIES})
|
||||
endif()
|
||||
endif()
|
||||
|
||||
85
externals/vcpkg/ports/sdformat9/fix-quote.patch
vendored
Executable file
85
externals/vcpkg/ports/sdformat9/fix-quote.patch
vendored
Executable file
@@ -0,0 +1,85 @@
|
||||
diff --git a/cmake/FindSSE.cmake b/cmake/FindSSE.cmake
|
||||
index cdbcfcc..0339a17 100644
|
||||
--- a/cmake/FindSSE.cmake
|
||||
+++ b/cmake/FindSSE.cmake
|
||||
@@ -5,7 +5,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64")
|
||||
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||||
EXEC_PROGRAM(cat ARGS "/proc/cpuinfo" OUTPUT_VARIABLE CPUINFO)
|
||||
|
||||
- STRING(REGEX REPLACE "^.*(sse2).*$" "\\1" SSE_THERE ${CPUINFO})
|
||||
+ STRING(REGEX REPLACE "^.*(sse2).*$" "\\1" SSE_THERE "${CPUINFO}")
|
||||
STRING(COMPARE EQUAL "sse2" "${SSE_THERE}" SSE2_TRUE)
|
||||
IF (SSE2_TRUE)
|
||||
set(SSE2_FOUND true CACHE BOOL "SSE2 available on host")
|
||||
@@ -14,14 +14,14 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64")
|
||||
ENDIF (SSE2_TRUE)
|
||||
|
||||
# /proc/cpuinfo apparently omits sse3 :(
|
||||
- STRING(REGEX REPLACE "^.*[^s](sse3).*$" "\\1" SSE_THERE ${CPUINFO})
|
||||
+ STRING(REGEX REPLACE "^.*[^s](sse3).*$" "\\1" SSE_THERE "${CPUINFO}")
|
||||
STRING(COMPARE EQUAL "sse3" "${SSE_THERE}" SSE3_TRUE)
|
||||
IF (NOT SSE3_TRUE)
|
||||
- STRING(REGEX REPLACE "^.*(T2300).*$" "\\1" SSE_THERE ${CPUINFO})
|
||||
+ STRING(REGEX REPLACE "^.*(T2300).*$" "\\1" SSE_THERE "${CPUINFO}")
|
||||
STRING(COMPARE EQUAL "T2300" "${SSE_THERE}" SSE3_TRUE)
|
||||
ENDIF (NOT SSE3_TRUE)
|
||||
|
||||
- STRING(REGEX REPLACE "^.*(ssse3).*$" "\\1" SSE_THERE ${CPUINFO})
|
||||
+ STRING(REGEX REPLACE "^.*(ssse3).*$" "\\1" SSE_THERE "${CPUINFO}")
|
||||
STRING(COMPARE EQUAL "ssse3" "${SSE_THERE}" SSSE3_TRUE)
|
||||
IF (SSE3_TRUE OR SSSE3_TRUE)
|
||||
set(SSE3_FOUND true CACHE BOOL "SSE3 available on host")
|
||||
@@ -34,7 +34,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64")
|
||||
set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host")
|
||||
ENDIF (SSSE3_TRUE)
|
||||
|
||||
- STRING(REGEX REPLACE "^.*(sse4_1).*$" "\\1" SSE_THERE ${CPUINFO})
|
||||
+ STRING(REGEX REPLACE "^.*(sse4_1).*$" "\\1" SSE_THERE "${CPUINFO}")
|
||||
STRING(COMPARE EQUAL "sse4_1" "${SSE_THERE}" SSE41_TRUE)
|
||||
IF (SSE41_TRUE)
|
||||
set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host")
|
||||
@@ -42,7 +42,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64")
|
||||
set(SSE4_1_FOUND false CACHE BOOL "SSE4.1 available on host")
|
||||
ENDIF (SSE41_TRUE)
|
||||
|
||||
- STRING(REGEX REPLACE "^.*(sse4_2).*$" "\\1" SSE_THERE ${CPUINFO})
|
||||
+ STRING(REGEX REPLACE "^.*(sse4_2).*$" "\\1" SSE_THERE "${CPUINFO}")
|
||||
STRING(COMPARE EQUAL "sse4_2" "${SSE_THERE}" SSE42_TRUE)
|
||||
IF (SSE42_TRUE)
|
||||
set(SSE4_2_FOUND true CACHE BOOL "SSE4.2 available on host")
|
||||
@@ -54,7 +54,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64")
|
||||
EXEC_PROGRAM("/usr/sbin/sysctl -n machdep.cpu.features" OUTPUT_VARIABLE
|
||||
CPUINFO)
|
||||
|
||||
- STRING(REGEX REPLACE "^.*[^S](SSE2).*$" "\\1" SSE_THERE ${CPUINFO})
|
||||
+ STRING(REGEX REPLACE "^.*[^S](SSE2).*$" "\\1" SSE_THERE "${CPUINFO}")
|
||||
STRING(COMPARE EQUAL "SSE2" "${SSE_THERE}" SSE2_TRUE)
|
||||
IF (SSE2_TRUE)
|
||||
set(SSE2_FOUND true CACHE BOOL "SSE2 available on host")
|
||||
@@ -62,7 +62,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64")
|
||||
set(SSE2_FOUND false CACHE BOOL "SSE2 available on host")
|
||||
ENDIF (SSE2_TRUE)
|
||||
|
||||
- STRING(REGEX REPLACE "^.*[^S](SSE3).*$" "\\1" SSE_THERE ${CPUINFO})
|
||||
+ STRING(REGEX REPLACE "^.*[^S](SSE3).*$" "\\1" SSE_THERE "${CPUINFO}")
|
||||
STRING(COMPARE EQUAL "SSE3" "${SSE_THERE}" SSE3_TRUE)
|
||||
IF (SSE3_TRUE)
|
||||
set(SSE3_FOUND true CACHE BOOL "SSE3 available on host")
|
||||
@@ -70,7 +70,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64")
|
||||
set(SSE3_FOUND false CACHE BOOL "SSE3 available on host")
|
||||
ENDIF (SSE3_TRUE)
|
||||
|
||||
- STRING(REGEX REPLACE "^.*(SSSE3).*$" "\\1" SSE_THERE ${CPUINFO})
|
||||
+ STRING(REGEX REPLACE "^.*(SSSE3).*$" "\\1" SSE_THERE "${CPUINFO}")
|
||||
STRING(COMPARE EQUAL "SSSE3" "${SSE_THERE}" SSSE3_TRUE)
|
||||
IF (SSSE3_TRUE)
|
||||
set(SSSE3_FOUND true CACHE BOOL "SSSE3 available on host")
|
||||
@@ -78,7 +78,7 @@ IF (ARCH MATCHES "i386" OR ARCH MATCHES "x86_64")
|
||||
set(SSSE3_FOUND false CACHE BOOL "SSSE3 available on host")
|
||||
ENDIF (SSSE3_TRUE)
|
||||
|
||||
- STRING(REGEX REPLACE "^.*(SSE4.1).*$" "\\1" SSE_THERE ${CPUINFO})
|
||||
+ STRING(REGEX REPLACE "^.*(SSE4.1).*$" "\\1" SSE_THERE "${CPUINFO}")
|
||||
STRING(COMPARE EQUAL "SSE4.1" "${SSE_THERE}" SSE41_TRUE)
|
||||
IF (SSE41_TRUE)
|
||||
set(SSE4_1_FOUND true CACHE BOOL "SSE4.1 available on host")
|
||||
38
externals/vcpkg/ports/sdformat9/no-absolute.patch
vendored
Executable file
38
externals/vcpkg/ports/sdformat9/no-absolute.patch
vendored
Executable file
@@ -0,0 +1,38 @@
|
||||
diff --git a/cmake/sdf_config.h.in b/cmake/sdf_config.h.in
|
||||
index c3ce2336..64ac9f5f 100644
|
||||
--- a/cmake/sdf_config.h.in
|
||||
+++ b/cmake/sdf_config.h.in
|
||||
@@ -31,6 +31,3 @@
|
||||
#cmakedefine BUILD_TYPE_RELEASE 1
|
||||
#cmakedefine HAVE_URDFDOM 1
|
||||
#cmakedefine USE_INTERNAL_URDF 1
|
||||
-
|
||||
-#define SDF_SHARE_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/"
|
||||
-#define SDF_VERSION_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/sdformat${SDF_MAJOR_VERSION}/${SDF_PKG_VERSION}"
|
||||
diff --git a/src/SDF.cc b/src/SDF.cc
|
||||
index 48c1943b..bd2c5b31 100644
|
||||
--- a/src/SDF.cc
|
||||
+++ b/src/SDF.cc
|
||||
@@ -100,22 +100,6 @@ std::string findFile(const std::string &_filename, bool _searchLocalPath,
|
||||
filename = filename.substr(idx + sep.length());
|
||||
}
|
||||
|
||||
- // Next check the install path.
|
||||
- path = sdf::filesystem::append(SDF_SHARE_PATH, filename);
|
||||
- if (sdf::filesystem::exists(path))
|
||||
- {
|
||||
- return path;
|
||||
- }
|
||||
-
|
||||
- // Next check the versioned install path.
|
||||
- path = sdf::filesystem::append(SDF_SHARE_PATH,
|
||||
- "sdformat" SDF_MAJOR_VERSION_STR,
|
||||
- sdf::SDF::Version(), filename);
|
||||
- if (sdf::filesystem::exists(path))
|
||||
- {
|
||||
- return path;
|
||||
- }
|
||||
-
|
||||
// Next check to see if the given file exists.
|
||||
path = filename;
|
||||
if (sdf::filesystem::exists(path))
|
||||
42
externals/vcpkg/ports/sdformat9/portfile.cmake
vendored
Executable file
42
externals/vcpkg/ports/sdformat9/portfile.cmake
vendored
Executable file
@@ -0,0 +1,42 @@
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO osrf/sdformat
|
||||
REF sdformat9_9.4.0
|
||||
SHA512 b7ed458a5a9ba5b5dcf457d3e0c9de0bca3d514a6870aa977a00a84f8a3b8d1bd21f3b437c0651af7f0cc9b9c6c8b905c968525194605b334ab62280b9d55b0e
|
||||
HEAD_REF sdf9
|
||||
PATCHES
|
||||
fix-dependency-urdfdom.patch
|
||||
fix-quote.patch
|
||||
no-absolute.patch
|
||||
use-external-tinyxml-windows.patch
|
||||
)
|
||||
|
||||
# Ruby is required by the sdformat build process
|
||||
vcpkg_find_acquire_program(RUBY)
|
||||
get_filename_component(RUBY_PATH ${RUBY} DIRECTORY)
|
||||
set(_path $ENV{PATH})
|
||||
vcpkg_add_to_path("${RUBY_PATH}")
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
-DBUILD_TESTING=OFF
|
||||
-DUSE_INTERNAL_URDF=OFF
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
|
||||
# Restore original path
|
||||
set(ENV{PATH} ${_path})
|
||||
|
||||
# Fix cmake targets and pkg-config file location
|
||||
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/sdformat9")
|
||||
vcpkg_fixup_pkgconfig()
|
||||
|
||||
# Remove debug files
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
|
||||
"${CURRENT_PACKAGES_DIR}/debug/lib/cmake"
|
||||
"${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
|
||||
# Handle copyright
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
26
externals/vcpkg/ports/sdformat9/use-external-tinyxml-windows.patch
vendored
Executable file
26
externals/vcpkg/ports/sdformat9/use-external-tinyxml-windows.patch
vendored
Executable file
@@ -0,0 +1,26 @@
|
||||
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)
|
||||
23
externals/vcpkg/ports/sdformat9/vcpkg.json
vendored
Executable file
23
externals/vcpkg/ports/sdformat9/vcpkg.json
vendored
Executable file
@@ -0,0 +1,23 @@
|
||||
{
|
||||
"name": "sdformat9",
|
||||
"version": "9.4.0",
|
||||
"port-version": 6,
|
||||
"description": "Simulation Description Format (SDF) parser and description files.",
|
||||
"homepage": "http://sdformat.org/",
|
||||
"license": "Apache-2.0",
|
||||
"supports": "!uwp",
|
||||
"dependencies": [
|
||||
"ignition-math6",
|
||||
"tinyxml",
|
||||
"urdfdom",
|
||||
"urdfdom-headers",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
}
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user