early-access version 2853
This commit is contained in:
14
externals/vcpkg/ports/ignition-cmake0/do-not-compile-gtest.patch
vendored
Executable file
14
externals/vcpkg/ports/ignition-cmake0/do-not-compile-gtest.patch
vendored
Executable file
@@ -0,0 +1,14 @@
|
||||
diff --git a/cmake/IgnConfigureBuild.cmake b/cmake/IgnConfigureBuild.cmake
|
||||
--- a/cmake/IgnConfigureBuild.cmake
|
||||
+++ b/cmake/IgnConfigureBuild.cmake
|
||||
@@ -109,7 +109,9 @@
|
||||
# Add all the source code directories
|
||||
add_subdirectory(src)
|
||||
add_subdirectory(include)
|
||||
- add_subdirectory(test)
|
||||
+ if(BUILD_TESTING)
|
||||
+ add_subdirectory(test)
|
||||
+ endif()
|
||||
|
||||
|
||||
#--------------------------------------
|
||||
16
externals/vcpkg/ports/ignition-cmake0/fix-find-ign-curl.patch
vendored
Executable file
16
externals/vcpkg/ports/ignition-cmake0/fix-find-ign-curl.patch
vendored
Executable file
@@ -0,0 +1,16 @@
|
||||
diff -r 3276aecbcbb4 -r 33b5d95affd2 cmake/FindIgnCURL.cmake
|
||||
--- a/cmake/FindIgnCURL.cmake
|
||||
+++ b/cmake/FindIgnCURL.cmake
|
||||
@@ -46,6 +46,12 @@
|
||||
|
||||
# Older versions of curl don't create imported targets, so we will create
|
||||
# them here if they have not been provided.
|
||||
+ if(TARGET CURL::libcurl AND NOT TARGET curl::curl)
|
||||
+ add_library(curl::curl INTERFACE IMPORTED)
|
||||
+ set_target_properties(curl::curl PROPERTIES
|
||||
+ INTERFACE_LINK_LIBRARIES CURL::libcurl)
|
||||
+ endif()
|
||||
+
|
||||
include(IgnImportTarget)
|
||||
|
||||
if(NOT TARGET curl::curl)
|
||||
24
externals/vcpkg/ports/ignition-cmake0/portfile.cmake
vendored
Executable file
24
externals/vcpkg/ports/ignition-cmake0/portfile.cmake
vendored
Executable file
@@ -0,0 +1,24 @@
|
||||
set(PACKAGE_VERSION "0.6.1")
|
||||
|
||||
ignition_modular_library(NAME cmake
|
||||
VERSION ${PACKAGE_VERSION}
|
||||
REF "ignition-cmake_${PACKAGE_VERSION}"
|
||||
SHA512 9414db04ef6ce0206aba4eb1c8192524249761976b82654da89222e0931d1e2bbd63dcc7f4e6c6fddbc71e54911e9bf9fcbd159f51862e89419e0686bfb035e9
|
||||
# Ensure that gtest is not compiled (backport of https://bitbucket.org/ignitionrobotics/ign-cmake/pull-requests/163)
|
||||
PATCHES do-not-compile-gtest.patch
|
||||
# Support for ARM64 (backport of https://bitbucket.org/ignitionrobotics/ign-cmake/pull-requests/168)
|
||||
support-arm64.patch
|
||||
# Do not depend on pkg-config installed to find uuid
|
||||
uuid-do-not-require-pkg-config.patch
|
||||
# Fix FindIgnCURL.cmake (backport of https://bitbucket.org/ignitionrobotics/ign-cmake/pull-requests/175)
|
||||
fix-find-ign-curl.patch
|
||||
)
|
||||
|
||||
# Permit empty include folder
|
||||
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
|
||||
|
||||
# Remove unneccessary directory, as ignition-cmake is a pure CMake package
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug")
|
||||
|
||||
# Install custom usage
|
||||
configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
|
||||
17
externals/vcpkg/ports/ignition-cmake0/support-arm64.patch
vendored
Executable file
17
externals/vcpkg/ports/ignition-cmake0/support-arm64.patch
vendored
Executable file
@@ -0,0 +1,17 @@
|
||||
diff -r 8a976a308d77 -r 1bea7874cfec cmake/IgnSetCompilerFlags.cmake
|
||||
--- a/cmake/IgnSetCompilerFlags.cmake
|
||||
+++ b/cmake/IgnSetCompilerFlags.cmake
|
||||
@@ -279,13 +279,6 @@
|
||||
# Don't pull in the Windows min/max macros
|
||||
add_definitions(-DNOMINMAX)
|
||||
|
||||
- if (MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||
- # Not needed if a proper cmake generator (-G "...Win64") is passed
|
||||
- # to cmake. Enable as a second measure to work around bug
|
||||
- # http://www.cmake.org/Bug/print_bug_page.php?bug_id=11240
|
||||
- set(CMAKE_SHARED_LINKER_FLAGS "/machine:x64")
|
||||
- endif()
|
||||
-
|
||||
if(USE_IGN_RECOMMENDED_FLAGS)
|
||||
|
||||
# Gy: Prevent errors caused by multiply-defined symbols
|
||||
3
externals/vcpkg/ports/ignition-cmake0/usage
vendored
Executable file
3
externals/vcpkg/ports/ignition-cmake0/usage
vendored
Executable file
@@ -0,0 +1,3 @@
|
||||
The package ignition-cmake0 provides CMake integration:
|
||||
|
||||
find_package(ignition-cmake0 CONFIG REQUIRED)
|
||||
30
externals/vcpkg/ports/ignition-cmake0/uuid-do-not-require-pkg-config.patch
vendored
Executable file
30
externals/vcpkg/ports/ignition-cmake0/uuid-do-not-require-pkg-config.patch
vendored
Executable file
@@ -0,0 +1,30 @@
|
||||
diff --git a/cmake/FindUUID.cmake b/cmake/FindUUID.cmake
|
||||
index bf055d4..15be822 100644
|
||||
--- a/cmake/FindUUID.cmake
|
||||
+++ b/cmake/FindUUID.cmake
|
||||
@@ -18,4 +18,25 @@
|
||||
if (UNIX)
|
||||
include(IgnPkgConfig)
|
||||
ign_pkg_check_modules(UUID uuid)
|
||||
+
|
||||
+ # If pkg-config is not available in the system,
|
||||
+ # it is neccessary to manually find uuid
|
||||
+ if(NOT TARGET UUID::UUID)
|
||||
+ find_path(UUID_INCLUDE_DIRS NAMES uuid.h PATH_SUFFIXES uuid)
|
||||
+ mark_as_advanced(UUID_INCLUDE_DIRS)
|
||||
+
|
||||
+ find_library(UUID_LIBRARIES NAMES uuid libuuid)
|
||||
+ mark_as_advanced(UUID_LIBRARIES)
|
||||
+
|
||||
+ if(NOT UUID_INCLUDE_DIRS OR NOT UUID_LIBRARIES)
|
||||
+ set(UUID_FOUND false)
|
||||
+ else()
|
||||
+ set(UUID_FOUND true)
|
||||
+ endif()
|
||||
+
|
||||
+ if(UUID_FOUND)
|
||||
+ include(IgnImportTarget)
|
||||
+ ign_import_target(UUID)
|
||||
+ endif()
|
||||
+ endif()
|
||||
endif()
|
||||
14
externals/vcpkg/ports/ignition-cmake0/vcpkg.json
vendored
Executable file
14
externals/vcpkg/ports/ignition-cmake0/vcpkg.json
vendored
Executable file
@@ -0,0 +1,14 @@
|
||||
{
|
||||
"name": "ignition-cmake0",
|
||||
"version": "0.6.2",
|
||||
"port-version": 4,
|
||||
"description": "CMake helper functions for building robotic applications",
|
||||
"homepage": "https://ignitionrobotics.org/libs/cmake",
|
||||
"license": null,
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "ignition-modularscripts",
|
||||
"host": true
|
||||
}
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user