From 73a99865b1ff60bb3aa3d6a7dd98219f9301d379 Mon Sep 17 00:00:00 2001 From: Thad House Date: Thu, 11 Apr 2019 23:03:35 -0700 Subject: Add WPILib port for vcpkg --- ...Fix-GUID-comparison-creating-weird-symbol.patch | 57 ++++++++++++++++++++ ports/wpilib/CONTROL | 11 ++++ ports/wpilib/portfile.cmake | 62 ++++++++++++++++++++++ scripts/buildsystems/vcpkg.cmake | 8 ++- 4 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 ports/wpilib/0006-Fix-GUID-comparison-creating-weird-symbol.patch create mode 100644 ports/wpilib/CONTROL create mode 100644 ports/wpilib/portfile.cmake diff --git a/ports/wpilib/0006-Fix-GUID-comparison-creating-weird-symbol.patch b/ports/wpilib/0006-Fix-GUID-comparison-creating-weird-symbol.patch new file mode 100644 index 000000000..44b6be481 --- /dev/null +++ b/ports/wpilib/0006-Fix-GUID-comparison-creating-weird-symbol.patch @@ -0,0 +1,57 @@ +From afa930371f3b297a1846cd1892576a20ec7e6ece Mon Sep 17 00:00:00 2001 +From: Thad House +Date: Thu, 11 Apr 2019 22:37:46 -0700 +Subject: [PATCH 6/6] Fix GUID comparison creating weird symbol + +--- + cscore/build.gradle | 4 ++-- + cscore/src/main/native/windows/UsbCameraImpl.cpp | 10 +++++----- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/cscore/build.gradle b/cscore/build.gradle +index 3162c8804..40cb97daf 100644 +--- a/cscore/build.gradle ++++ b/cscore/build.gradle +@@ -98,11 +98,11 @@ model { + x86ExcludeSymbols = ['_CT??_R0?AV_System_error', '_CT??_R0?AVexception', '_CT??_R0?AVfailure', + '_CT??_R0?AVbad_cast', + '_CT??_R0?AVruntime_error', '_CT??_R0?AVsystem_error', '_CTA5?AVfailure', +- '_TI5?AVfailure', '=='] ++ '_TI5?AVfailure'] + x64ExcludeSymbols = ['_CT??_R0?AV_System_error', '_CT??_R0?AVexception', '_CT??_R0?AVfailure', + '_CT??_R0?AVbad_cast', + '_CT??_R0?AVruntime_error', '_CT??_R0?AVsystem_error', '_CTA5?AVfailure', +- '_TI5?AVfailure', '=='] ++ '_TI5?AVfailure'] + } + cscoreJNI(ExportsConfig) { + x86SymbolFilter = { symbols -> +diff --git a/cscore/src/main/native/windows/UsbCameraImpl.cpp b/cscore/src/main/native/windows/UsbCameraImpl.cpp +index e45f361d4..3a6446554 100644 +--- a/cscore/src/main/native/windows/UsbCameraImpl.cpp ++++ b/cscore/src/main/native/windows/UsbCameraImpl.cpp +@@ -413,16 +413,16 @@ LRESULT UsbCameraImpl::PumpMain(HWND hwnd, UINT uiMsg, WPARAM wParam, + + static cs::VideoMode::PixelFormat GetFromGUID(const GUID& guid) { + // Compare GUID to one of the supported ones +- if (guid == MFVideoFormat_NV12) { ++ if (IsEqualGUID(guid, MFVideoFormat_NV12)) { + // GrayScale + return cs::VideoMode::PixelFormat::kGray; +- } else if (guid == MFVideoFormat_YUY2) { ++ } else if (IsEqualGUID(guid, MFVideoFormat_YUY2)) { + return cs::VideoMode::PixelFormat::kYUYV; +- } else if (guid == MFVideoFormat_RGB24) { ++ } else if (IsEqualGUID(guid, MFVideoFormat_RGB24)) { + return cs::VideoMode::PixelFormat::kBGR; +- } else if (guid == MFVideoFormat_MJPG) { ++ } else if (IsEqualGUID(guid, MFVideoFormat_MJPG)) { + return cs::VideoMode::PixelFormat::kMJPEG; +- } else if (guid == MFVideoFormat_RGB565) { ++ } else if (IsEqualGUID(guid, MFVideoFormat_RGB565)) { + return cs::VideoMode::PixelFormat::kRGB565; + } else { + return cs::VideoMode::PixelFormat::kUnknown; +-- +2.18.0.windows.1 + diff --git a/ports/wpilib/CONTROL b/ports/wpilib/CONTROL new file mode 100644 index 000000000..24ab2e23f --- /dev/null +++ b/ports/wpilib/CONTROL @@ -0,0 +1,11 @@ +Source: wpilib +Version: 2019.4.1 +Description: WPILib is the software library package for the FIRST Robotics Competition. The core install includes wpiutil, a common utilies library, and ntcore, the base NetworkTables library. + +Feature: cameraserver +Build-Depends: opencv +Description: Enables the CameraServer and CSCore libraries for manipulating USB Cameras and HTTP Camera Streams + +Feature: allwpilib +Build-Depends: wpilib[cameraserver] opencv +Description: Enables the simulation HAL, and the high level wpilibc library. diff --git a/ports/wpilib/portfile.cmake b/ports/wpilib/portfile.cmake new file mode 100644 index 000000000..90627060e --- /dev/null +++ b/ports/wpilib/portfile.cmake @@ -0,0 +1,62 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO wpilibsuite/allwpilib + REF v2019.4.1 + SHA512 8a79e55cd5f3aaf60eb8c0a952d33c82b5e5c997e72d7ad1cf3a99165a0057dfc5d3fc742d7dcefc7a1d3031bfc185b107968545159d7d5177a601df85df271e + HEAD_REF master + PATCHES + 0006-Fix-GUID-comparison-creating-weird-symbol.patch +) + +set(WITHOUT_JAVA ON) +set(WITHOUT_CSCORE ON) +set(WITHOUT_ALLWPILIB ON) + +if ("cameraserver" IN_LIST FEATURES) + set(WITHOUT_CSCORE OFF) +endif() + +if ("allwpilib" IN_LIST FEATURES) + set(WITHOUT_ALLWPILIB OFF) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + + OPTIONS + -DWITHOUT_JAVA=${WITHOUT_JAVA} + -DWITHOUT_CSCORE=${WITHOUT_CSCORE} + -DWITHOUT_ALLWPILIB=${WITHOUT_ALLWPILIB} + -DFLAT_INSTALL_HEADERS=ON +) +vcpkg_install_cmake() + +file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/ntcore/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/wpiutil/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) +if (NOT WITHOUT_ALLWPILIB) +file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/wpilibc/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/hal/gen/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/hal/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/gen) +endif() +if (NOT WITHOUT_CSCORE) +file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/cameraserver/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/cscore/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) +endif() + +file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dll") +file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dll") + +file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.pdb") +file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.pdb") + +file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.lib") +file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.lib") + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/wpilib) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/wpilib) + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/wpilib RENAME copyright) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index b2a589421..29bbd7523 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -37,6 +37,12 @@ else() set(_VCPKG_TARGET_TRIPLET_ARCH arm) elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 15 2017$") set(_VCPKG_TARGET_TRIPLET_ARCH x86) + elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 16 2019 Win64$") + set(_VCPKG_TARGET_TRIPLET_ARCH x64) + elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 16 2019 ARM$") + set(_VCPKG_TARGET_TRIPLET_ARCH arm) + elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 16 2019$") + set(_VCPKG_TARGET_TRIPLET_ARCH x86) else() find_program(_VCPKG_CL cl) if(_VCPKG_CL MATCHES "amd64/cl.exe$" OR _VCPKG_CL MATCHES "x64/cl.exe$") @@ -95,7 +101,7 @@ if(NOT EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" AND NOT _CMAKE_I message(WARNING "There are no libraries installed for the Vcpkg triplet ${VCPKG_TARGET_TRIPLET}.") endif() -if(CMAKE_BUILD_TYPE MATCHES "^Debug$" OR NOT DEFINED CMAKE_BUILD_TYPE) #Debug build: Put Debug paths before Release paths. +if(CMAKE_BUILD_TYPE MATCHES "^Debug$" OR NOT DEFINED CMAKE_BUILD_TYPE) #Debug build: Put Debug paths before Release paths. list(APPEND CMAKE_PREFIX_PATH ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET} ) -- cgit v1.2.3 From 8e50af6ff77f71b5641cd5e7ce76a34b8692d0eb Mon Sep 17 00:00:00 2001 From: Thad House Date: Sat, 13 Apr 2019 14:38:13 -0700 Subject: Update wpilib port to custom build --- ...Fix-GUID-comparison-creating-weird-symbol.patch | 57 ---------------------- ports/wpilib/CONTROL | 1 + ports/wpilib/portfile.cmake | 15 +++--- 3 files changed, 7 insertions(+), 66 deletions(-) delete mode 100644 ports/wpilib/0006-Fix-GUID-comparison-creating-weird-symbol.patch diff --git a/ports/wpilib/0006-Fix-GUID-comparison-creating-weird-symbol.patch b/ports/wpilib/0006-Fix-GUID-comparison-creating-weird-symbol.patch deleted file mode 100644 index 44b6be481..000000000 --- a/ports/wpilib/0006-Fix-GUID-comparison-creating-weird-symbol.patch +++ /dev/null @@ -1,57 +0,0 @@ -From afa930371f3b297a1846cd1892576a20ec7e6ece Mon Sep 17 00:00:00 2001 -From: Thad House -Date: Thu, 11 Apr 2019 22:37:46 -0700 -Subject: [PATCH 6/6] Fix GUID comparison creating weird symbol - ---- - cscore/build.gradle | 4 ++-- - cscore/src/main/native/windows/UsbCameraImpl.cpp | 10 +++++----- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/cscore/build.gradle b/cscore/build.gradle -index 3162c8804..40cb97daf 100644 ---- a/cscore/build.gradle -+++ b/cscore/build.gradle -@@ -98,11 +98,11 @@ model { - x86ExcludeSymbols = ['_CT??_R0?AV_System_error', '_CT??_R0?AVexception', '_CT??_R0?AVfailure', - '_CT??_R0?AVbad_cast', - '_CT??_R0?AVruntime_error', '_CT??_R0?AVsystem_error', '_CTA5?AVfailure', -- '_TI5?AVfailure', '=='] -+ '_TI5?AVfailure'] - x64ExcludeSymbols = ['_CT??_R0?AV_System_error', '_CT??_R0?AVexception', '_CT??_R0?AVfailure', - '_CT??_R0?AVbad_cast', - '_CT??_R0?AVruntime_error', '_CT??_R0?AVsystem_error', '_CTA5?AVfailure', -- '_TI5?AVfailure', '=='] -+ '_TI5?AVfailure'] - } - cscoreJNI(ExportsConfig) { - x86SymbolFilter = { symbols -> -diff --git a/cscore/src/main/native/windows/UsbCameraImpl.cpp b/cscore/src/main/native/windows/UsbCameraImpl.cpp -index e45f361d4..3a6446554 100644 ---- a/cscore/src/main/native/windows/UsbCameraImpl.cpp -+++ b/cscore/src/main/native/windows/UsbCameraImpl.cpp -@@ -413,16 +413,16 @@ LRESULT UsbCameraImpl::PumpMain(HWND hwnd, UINT uiMsg, WPARAM wParam, - - static cs::VideoMode::PixelFormat GetFromGUID(const GUID& guid) { - // Compare GUID to one of the supported ones -- if (guid == MFVideoFormat_NV12) { -+ if (IsEqualGUID(guid, MFVideoFormat_NV12)) { - // GrayScale - return cs::VideoMode::PixelFormat::kGray; -- } else if (guid == MFVideoFormat_YUY2) { -+ } else if (IsEqualGUID(guid, MFVideoFormat_YUY2)) { - return cs::VideoMode::PixelFormat::kYUYV; -- } else if (guid == MFVideoFormat_RGB24) { -+ } else if (IsEqualGUID(guid, MFVideoFormat_RGB24)) { - return cs::VideoMode::PixelFormat::kBGR; -- } else if (guid == MFVideoFormat_MJPG) { -+ } else if (IsEqualGUID(guid, MFVideoFormat_MJPG)) { - return cs::VideoMode::PixelFormat::kMJPEG; -- } else if (guid == MFVideoFormat_RGB565) { -+ } else if (IsEqualGUID(guid, MFVideoFormat_RGB565)) { - return cs::VideoMode::PixelFormat::kRGB565; - } else { - return cs::VideoMode::PixelFormat::kUnknown; --- -2.18.0.windows.1 - diff --git a/ports/wpilib/CONTROL b/ports/wpilib/CONTROL index 24ab2e23f..0d93d9bb5 100644 --- a/ports/wpilib/CONTROL +++ b/ports/wpilib/CONTROL @@ -1,5 +1,6 @@ Source: wpilib Version: 2019.4.1 +Build-Depends: libuv Description: WPILib is the software library package for the FIRST Robotics Competition. The core install includes wpiutil, a common utilies library, and ntcore, the base NetworkTables library. Feature: cameraserver diff --git a/ports/wpilib/portfile.cmake b/ports/wpilib/portfile.cmake index 90627060e..36ba4aba6 100644 --- a/ports/wpilib/portfile.cmake +++ b/ports/wpilib/portfile.cmake @@ -2,12 +2,10 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO wpilibsuite/allwpilib - REF v2019.4.1 - SHA512 8a79e55cd5f3aaf60eb8c0a952d33c82b5e5c997e72d7ad1cf3a99165a0057dfc5d3fc742d7dcefc7a1d3031bfc185b107968545159d7d5177a601df85df271e - HEAD_REF master - PATCHES - 0006-Fix-GUID-comparison-creating-weird-symbol.patch + REPO thadhouse/allwpilib + REF v2019.42.42 + SHA512 fd8d1030bffe67912c09e6dd9aedd71be10a5994aae9d371eb7a0b0faa67bc2743a16d9c31a4472f933819d3d109c676d506df7ca6df46ca68ec92290d3a8a47 + HEAD_REF vcpkgrelease ) set(WITHOUT_JAVA ON) @@ -30,7 +28,7 @@ vcpkg_configure_cmake( -DWITHOUT_JAVA=${WITHOUT_JAVA} -DWITHOUT_CSCORE=${WITHOUT_CSCORE} -DWITHOUT_ALLWPILIB=${WITHOUT_ALLWPILIB} - -DFLAT_INSTALL_HEADERS=ON + -DUSE_VCPKG_LIBUV=ON ) vcpkg_install_cmake() @@ -56,7 +54,6 @@ file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAG file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.lib") file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.lib") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/wpilib) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/wpilib) +vcpkg_copy_pdbs() file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/wpilib RENAME copyright) -- cgit v1.2.3 From 92499d35cfd141d4483a92169a648e723c852cce Mon Sep 17 00:00:00 2001 From: Thad House Date: Sat, 13 Apr 2019 23:00:54 -0700 Subject: Linux building, and cmake building --- ...-Update-cmake-find-to-support-vcpkg-libuv.patch | 330 +++++++++++++++++++++ ports/wpilib/portfile.cmake | 18 +- 2 files changed, 344 insertions(+), 4 deletions(-) create mode 100644 ports/wpilib/0001-Update-cmake-find-to-support-vcpkg-libuv.patch diff --git a/ports/wpilib/0001-Update-cmake-find-to-support-vcpkg-libuv.patch b/ports/wpilib/0001-Update-cmake-find-to-support-vcpkg-libuv.patch new file mode 100644 index 000000000..2d05db51d --- /dev/null +++ b/ports/wpilib/0001-Update-cmake-find-to-support-vcpkg-libuv.patch @@ -0,0 +1,330 @@ +From b560407ca2228da9f3c10f457800314a49336466 Mon Sep 17 00:00:00 2001 +From: Thad House +Date: Sat, 13 Apr 2019 22:04:31 -0700 +Subject: [PATCH] Update cmake find to support vcpkg libuv + +--- + CMakeLists.txt | 18 ++++++++++++++---- + cameraserver/CMakeLists.txt | 3 ++- + cameraserver/cameraserver-config.cmake | 8 -------- + cameraserver/cameraserver-config.cmake.in | 9 +++++++++ + cscore/CMakeLists.txt | 3 ++- + cscore/cscore-config.cmake | 6 ------ + cscore/cscore-config.cmake.in | 6 ++++++ + hal/CMakeLists.txt | 3 ++- + hal/hal-config.cmake | 5 ----- + hal/hal-config.cmake.in | 5 +++++ + ntcore/CMakeLists.txt | 3 ++- + ntcore/ntcore-config.cmake | 5 ----- + ntcore/ntcore-config.cmake.in | 5 +++++ + wpilib-config.cmake.in | 6 ++++-- + wpilibc/CMakeLists.txt | 3 ++- + wpilibc/wpilibc-config.cmake | 10 ---------- + wpilibc/wpilibc-config.cmake.in | 9 +++++++++ + wpiutil/CMakeLists.txt | 3 ++- + wpiutil/wpiutil-config.cmake | 2 -- + wpiutil/wpiutil-config.cmake.in | 7 +++++++ + 20 files changed, 71 insertions(+), 48 deletions(-) + delete mode 100644 cameraserver/cameraserver-config.cmake + create mode 100644 cameraserver/cameraserver-config.cmake.in + delete mode 100644 cscore/cscore-config.cmake + create mode 100644 cscore/cscore-config.cmake.in + delete mode 100644 hal/hal-config.cmake + create mode 100644 hal/hal-config.cmake.in + delete mode 100644 ntcore/ntcore-config.cmake + create mode 100644 ntcore/ntcore-config.cmake.in + delete mode 100644 wpilibc/wpilibc-config.cmake + create mode 100644 wpilibc/wpilibc-config.cmake.in + delete mode 100644 wpiutil/wpiutil-config.cmake + create mode 100644 wpiutil/wpiutil-config.cmake.in + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a5b89d9ac..f4e348e56 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -72,20 +72,30 @@ else() + set (wpilib_config_dir share/wpilib) + endif() + ++if (USE_VCPKG_LIBUV) ++set (LIBUV_VCPKG_REPLACE "find_package(unofficial-libuv CONFIG)") ++endif() ++ ++set(WPIUTIL_DEP_REPLACE "include($\{SELF_DIR\}/wpiutil-config.cmake)") ++set(NTCORE_DEP_REPLACE "include($\{SELF_DIR\}/ntcore-config.cmake)") ++ ++set(FILENAME_DEP_REPLACE "get_filename_component(SELF_DIR \"$\{CMAKE_CURRENT_LIST_FILE\}\" PATH)") ++set(SELF_DIR "$\{SELF_DIR\}") ++ + add_subdirectory(wpiutil) + add_subdirectory(ntcore) + + if (NOT WITHOUT_CSCORE) ++ set (CSCORE_DEP_REPLACE "include(\${SELF_DIR}/wpiutil-config.cmake)") ++ set (CAMERASERVER_DEP_REPLACE "include(\${SELF_DIR}/wpiutil-config.cmake)") + add_subdirectory(cscore) + add_subdirectory(cameraserver) +- set (CSCORE_DEP_REPLACE "find_dependency(cscore)") +- set (CAMERASERVER_DEP_REPLACE "find_dependency(cameraserver)") + if (NOT WITHOUT_ALLWPILIB) ++ set (HAL_DEP_REPLACE "include(\${SELF_DIR}/hal-config.cmake)") ++ set (WPILIBC_DEP_REPLACE "include(\${SELF_DIR}/wpilibc-config.cmake)") + add_subdirectory(hal) + add_subdirectory(wpilibj) + add_subdirectory(wpilibc) +- set (HAL_DEP_REPLACE "find_dependency(hal)") +- set (WPILIBC_DEP_REPLACE "find_dependency(wpilibc)") + endif() + endif() + +diff --git a/cameraserver/CMakeLists.txt b/cameraserver/CMakeLists.txt +index a3a74607a..75a45ce69 100644 +--- a/cameraserver/CMakeLists.txt ++++ b/cameraserver/CMakeLists.txt +@@ -49,7 +49,8 @@ else() + set (cameraserver_config_dir share/cameraserver) + endif() + +-install(FILES cameraserver-config.cmake DESTINATION ${cameraserver_config_dir}) ++configure_file(cameraserver-config.cmake.in ${CMAKE_BINARY_DIR}/cameraserver-config.cmake ) ++install(FILES ${CMAKE_BINARY_DIR}/cameraserver-config.cmake DESTINATION ${cameraserver_config_dir}) + install(EXPORT cameraserver DESTINATION ${cameraserver_config_dir}) + + file(GLOB multiCameraServer_src multiCameraServer/src/main/native/cpp/*.cpp) +diff --git a/cameraserver/cameraserver-config.cmake b/cameraserver/cameraserver-config.cmake +deleted file mode 100644 +index 2c2b1cc33..000000000 +--- a/cameraserver/cameraserver-config.cmake ++++ /dev/null +@@ -1,8 +0,0 @@ +-include(CMakeFindDependencyMacro) +-find_dependency(wpiutil) +-find_dependency(ntcore) +-find_dependency(cscore) +-find_dependency(OpenCV) +- +-get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +-include(${SELF_DIR}/cameraserver.cmake) +diff --git a/cameraserver/cameraserver-config.cmake.in b/cameraserver/cameraserver-config.cmake.in +new file mode 100644 +index 000000000..0c71fc58c +--- /dev/null ++++ b/cameraserver/cameraserver-config.cmake.in +@@ -0,0 +1,9 @@ ++include(CMakeFindDependencyMacro) ++@FILENAME_DEP_REPLACE@ ++@WPIUTIL_DEP_REPLACE@ ++@NTCORE_DEP_REPLACE@ ++@CSCORE_DEP_REPLACE@ ++find_dependency(OpenCV) ++ ++include(${SELF_DIR}/cameraserver.cmake) ++ +diff --git a/cscore/CMakeLists.txt b/cscore/CMakeLists.txt +index 52bcb54a2..f6675e29c 100644 +--- a/cscore/CMakeLists.txt ++++ b/cscore/CMakeLists.txt +@@ -42,7 +42,8 @@ else() + set (cscore_config_dir share/cscore) + endif() + +-install(FILES cscore-config.cmake DESTINATION ${cscore_config_dir}) ++configure_file(cscore-config.cmake.in ${CMAKE_BINARY_DIR}/cscore-config.cmake ) ++install(FILES ${CMAKE_BINARY_DIR}/cscore-config.cmake DESTINATION ${cscore_config_dir}) + install(EXPORT cscore DESTINATION ${cscore_config_dir}) + + SUBDIR_LIST(cscore_examples "${CMAKE_CURRENT_SOURCE_DIR}/examples") +diff --git a/cscore/cscore-config.cmake b/cscore/cscore-config.cmake +deleted file mode 100644 +index 790633b87..000000000 +--- a/cscore/cscore-config.cmake ++++ /dev/null +@@ -1,6 +0,0 @@ +-include(CMakeFindDependencyMacro) +-find_dependency(wpiutil) +-find_dependency(OpenCV) +- +-get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +-include(${SELF_DIR}/cscore.cmake) +diff --git a/cscore/cscore-config.cmake.in b/cscore/cscore-config.cmake.in +new file mode 100644 +index 000000000..7894fbaec +--- /dev/null ++++ b/cscore/cscore-config.cmake.in +@@ -0,0 +1,6 @@ ++include(CMakeFindDependencyMacro) ++@FILENAME_DEP_REPLACE@ ++@WPIUTIL_DEP_REPLACE@ ++find_dependency(OpenCV) ++ ++include(${SELF_DIR}/cscore.cmake) +diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt +index e52d90ff0..3e338faec 100644 +--- a/hal/CMakeLists.txt ++++ b/hal/CMakeLists.txt +@@ -61,7 +61,8 @@ else() + set (hal_config_dir share/hal) + endif() + +-install(FILES hal-config.cmake DESTINATION ${hal_config_dir}) ++configure_file(hal-config.cmake.in ${CMAKE_BINARY_DIR}/hal-config.cmake ) ++install(FILES ${CMAKE_BINARY_DIR}/hal-config.cmake DESTINATION ${hal_config_dir}) + install(EXPORT hal DESTINATION ${hal_config_dir}) + + # Java bindings +diff --git a/hal/hal-config.cmake b/hal/hal-config.cmake +deleted file mode 100644 +index 97a574ebf..000000000 +--- a/hal/hal-config.cmake ++++ /dev/null +@@ -1,5 +0,0 @@ +-include(CMakeFindDependencyMacro) +-find_dependency(wpiutil) +- +-get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +-include(${SELF_DIR}/hal.cmake) +diff --git a/hal/hal-config.cmake.in b/hal/hal-config.cmake.in +new file mode 100644 +index 000000000..ae5533c27 +--- /dev/null ++++ b/hal/hal-config.cmake.in +@@ -0,0 +1,5 @@ ++include(CMakeFindDependencyMacro) ++@FILENAME_DEP_REPLACE@ ++@WPIUTIL_DEP_REPLACE@ ++ ++include(${SELF_DIR}/hal.cmake) +diff --git a/ntcore/CMakeLists.txt b/ntcore/CMakeLists.txt +index 47e226401..aaf6159b2 100644 +--- a/ntcore/CMakeLists.txt ++++ b/ntcore/CMakeLists.txt +@@ -22,7 +22,8 @@ else() + set (ntcore_config_dir share/ntcore) + endif() + +-install(FILES ntcore-config.cmake DESTINATION ${ntcore_config_dir}) ++configure_file(ntcore-config.cmake.in ${CMAKE_BINARY_DIR}/ntcore-config.cmake ) ++install(FILES ${CMAKE_BINARY_DIR}/ntcore-config.cmake DESTINATION ${ntcore_config_dir}) + install(EXPORT ntcore DESTINATION ${ntcore_config_dir}) + + # Java bindings +diff --git a/ntcore/ntcore-config.cmake b/ntcore/ntcore-config.cmake +deleted file mode 100644 +index 6be1dda4a..000000000 +--- a/ntcore/ntcore-config.cmake ++++ /dev/null +@@ -1,5 +0,0 @@ +-include(CMakeFindDependencyMacro) +-find_dependency(wpiutil) +- +-get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +-include(${SELF_DIR}/ntcore.cmake) +diff --git a/ntcore/ntcore-config.cmake.in b/ntcore/ntcore-config.cmake.in +new file mode 100644 +index 000000000..1e950e90c +--- /dev/null ++++ b/ntcore/ntcore-config.cmake.in +@@ -0,0 +1,5 @@ ++include(CMakeFindDependencyMacro) ++@FILENAME_DEP_REPLACE@ ++@WPIUTIL_DEP_REPLACE@ ++ ++include(${SELF_DIR}/ntcore.cmake) +diff --git a/wpilib-config.cmake.in b/wpilib-config.cmake.in +index 445db82d7..2c15dfe09 100644 +--- a/wpilib-config.cmake.in ++++ b/wpilib-config.cmake.in +@@ -1,8 +1,10 @@ + include(CMakeFindDependencyMacro) ++@FILENAME_DEP_REPLACE@ + set(THREADS_PREFER_PTHREAD_FLAG ON) + find_dependency(Threads) +-find_dependency(wpiutil) +-find_dependency(ntcore) ++@LIBUV_VCPKG_REPLACE@ ++@WPIUTIL_DEP_REPLACE@ ++@NTCORE_DEP_REPLACE@ + @CSCORE_DEP_REPLACE@ + @CAMERASERVER_DEP_REPLACE@ + @HAL_DEP_REPLACE@ +diff --git a/wpilibc/CMakeLists.txt b/wpilibc/CMakeLists.txt +index da3587188..e04d3df3f 100644 +--- a/wpilibc/CMakeLists.txt ++++ b/wpilibc/CMakeLists.txt +@@ -26,5 +26,6 @@ else() + set (wpilibc_config_dir share/wpilibc) + endif() + +-install(FILES wpilibc-config.cmake DESTINATION ${wpilibc_config_dir}) ++configure_file(wpilibc-config.cmake.in ${CMAKE_BINARY_DIR}/wpilibc-config.cmake ) ++install(FILES ${CMAKE_BINARY_DIR}/wpilibc-config.cmake DESTINATION ${wpilibc_config_dir}) + install(EXPORT wpilibc DESTINATION ${wpilibc_config_dir}) +diff --git a/wpilibc/wpilibc-config.cmake b/wpilibc/wpilibc-config.cmake +deleted file mode 100644 +index 86f077c71..000000000 +--- a/wpilibc/wpilibc-config.cmake ++++ /dev/null +@@ -1,10 +0,0 @@ +-include(CMakeFindDependencyMacro) +-find_dependency(wpiutil) +-find_dependency(ntcore) +-find_dependency(cscore) +-find_dependency(cameraserver) +-find_dependency(hal) +-find_dependency(OpenCV) +- +-get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +-include(${SELF_DIR}/wpilibc.cmake) +diff --git a/wpilibc/wpilibc-config.cmake.in b/wpilibc/wpilibc-config.cmake.in +new file mode 100644 +index 000000000..4332c550e +--- /dev/null ++++ b/wpilibc/wpilibc-config.cmake.in +@@ -0,0 +1,9 @@ ++include(CMakeFindDependencyMacro) ++@FILENAME_DEP_REPLACE@ ++@WPIUTIL_DEP_REPLACE@ ++@NTCORE_DEP_REPLACE@ ++@CSCORE_DEP_REPLACE@ ++@CAMERASERVER_DEP_REPLACE@ ++@HAL_DEP_REPLACE@ ++ ++include(${SELF_DIR}/wpilibc.cmake) +diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt +index bcc0bcf5b..653ab141d 100644 +--- a/wpiutil/CMakeLists.txt ++++ b/wpiutil/CMakeLists.txt +@@ -130,7 +130,8 @@ else() + set (wpiutil_config_dir share/wpiutil) + endif() + +-install(FILES wpiutil-config.cmake DESTINATION ${wpiutil_config_dir}) ++configure_file(wpiutil-config.cmake.in ${CMAKE_BINARY_DIR}/wpiutil-config.cmake ) ++install(FILES ${CMAKE_BINARY_DIR}/wpiutil-config.cmake DESTINATION ${wpiutil_config_dir}) + install(EXPORT wpiutil DESTINATION ${wpiutil_config_dir}) + + SUBDIR_LIST(wpiutil_examples "${CMAKE_CURRENT_SOURCE_DIR}/examples") +diff --git a/wpiutil/wpiutil-config.cmake b/wpiutil/wpiutil-config.cmake +deleted file mode 100644 +index 91d01a77c..000000000 +--- a/wpiutil/wpiutil-config.cmake ++++ /dev/null +@@ -1,2 +0,0 @@ +-get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +-include(${SELF_DIR}/wpiutil.cmake) +diff --git a/wpiutil/wpiutil-config.cmake.in b/wpiutil/wpiutil-config.cmake.in +new file mode 100644 +index 000000000..5d71bc192 +--- /dev/null ++++ b/wpiutil/wpiutil-config.cmake.in +@@ -0,0 +1,7 @@ ++include(CMakeFindDependencyMacro) ++@FILENAME_DEP_REPLACE@ ++set(THREADS_PREFER_PTHREAD_FLAG ON) ++find_dependency(Threads) ++@LIBUV_VCPKG_REPLACE@ ++ ++include(${SELF_DIR}/wpiutil.cmake) +-- +2.18.0.windows.1 + diff --git a/ports/wpilib/portfile.cmake b/ports/wpilib/portfile.cmake index 36ba4aba6..752de1d07 100644 --- a/ports/wpilib/portfile.cmake +++ b/ports/wpilib/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF v2019.42.42 SHA512 fd8d1030bffe67912c09e6dd9aedd71be10a5994aae9d371eb7a0b0faa67bc2743a16d9c31a4472f933819d3d109c676d506df7ca6df46ca68ec92290d3a8a47 HEAD_REF vcpkgrelease + PATCHES + 0001-Update-cmake-find-to-support-vcpkg-libuv.patch ) set(WITHOUT_JAVA ON) @@ -45,15 +47,23 @@ file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/cameraserver/ DESTINATION ${CUR file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/cscore/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) endif() -file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dll") -file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dll") +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dll") + file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dll") -file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.pdb") -file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.pdb") + file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.so") + file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.so") + + file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dylib") + file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dylib") +endif() file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.lib") file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.lib") +file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.a") +file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.a") + vcpkg_copy_pdbs() file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/wpilib RENAME copyright) -- cgit v1.2.3 From 6500d20d482325a4ba2512ac00bdc27300ff98ed Mon Sep 17 00:00:00 2001 From: Thad House Date: Sun, 14 Apr 2019 10:05:22 -0700 Subject: Add flat install settings for wpulib --- ...-Update-cmake-find-to-support-vcpkg-libuv.patch | 162 ++++++++++++++++----- ports/wpilib/portfile.cmake | 3 +- 2 files changed, 125 insertions(+), 40 deletions(-) diff --git a/ports/wpilib/0001-Update-cmake-find-to-support-vcpkg-libuv.patch b/ports/wpilib/0001-Update-cmake-find-to-support-vcpkg-libuv.patch index 2d05db51d..6551be4ce 100644 --- a/ports/wpilib/0001-Update-cmake-find-to-support-vcpkg-libuv.patch +++ b/ports/wpilib/0001-Update-cmake-find-to-support-vcpkg-libuv.patch @@ -1,30 +1,31 @@ -From b560407ca2228da9f3c10f457800314a49336466 Mon Sep 17 00:00:00 2001 +From 090e7210fcb8ba91268a21f174a26a66762bbaee Mon Sep 17 00:00:00 2001 From: Thad House Date: Sat, 13 Apr 2019 22:04:31 -0700 Subject: [PATCH] Update cmake find to support vcpkg libuv --- - CMakeLists.txt | 18 ++++++++++++++---- - cameraserver/CMakeLists.txt | 3 ++- - cameraserver/cameraserver-config.cmake | 8 -------- - cameraserver/cameraserver-config.cmake.in | 9 +++++++++ - cscore/CMakeLists.txt | 3 ++- - cscore/cscore-config.cmake | 6 ------ - cscore/cscore-config.cmake.in | 6 ++++++ - hal/CMakeLists.txt | 3 ++- - hal/hal-config.cmake | 5 ----- - hal/hal-config.cmake.in | 5 +++++ - ntcore/CMakeLists.txt | 3 ++- - ntcore/ntcore-config.cmake | 5 ----- - ntcore/ntcore-config.cmake.in | 5 +++++ - wpilib-config.cmake.in | 6 ++++-- - wpilibc/CMakeLists.txt | 3 ++- - wpilibc/wpilibc-config.cmake | 10 ---------- - wpilibc/wpilibc-config.cmake.in | 9 +++++++++ - wpiutil/CMakeLists.txt | 3 ++- + CMakeLists.txt | 34 +++++++++++++++++++---- + cameraserver/CMakeLists.txt | 5 ++-- + cameraserver/cameraserver-config.cmake | 8 ------ + cameraserver/cameraserver-config.cmake.in | 9 ++++++ + cscore/CMakeLists.txt | 5 ++-- + cscore/cscore-config.cmake | 6 ---- + cscore/cscore-config.cmake.in | 6 ++++ + hal/CMakeLists.txt | 5 ++-- + hal/hal-config.cmake | 5 ---- + hal/hal-config.cmake.in | 5 ++++ + ntcore/CMakeLists.txt | 5 ++-- + ntcore/ntcore-config.cmake | 5 ---- + ntcore/ntcore-config.cmake.in | 5 ++++ + wpilib-config.cmake.in | 6 ++-- + wpilibc/CMakeLists.txt | 5 ++-- + wpilibc/wpilibc-config.cmake | 10 ------- + wpilibc/wpilibc-config.cmake.in | 9 ++++++ + wpilibj/CMakeLists.txt | 2 +- + wpiutil/CMakeLists.txt | 5 ++-- wpiutil/wpiutil-config.cmake | 2 -- - wpiutil/wpiutil-config.cmake.in | 7 +++++++ - 20 files changed, 71 insertions(+), 48 deletions(-) + wpiutil/wpiutil-config.cmake.in | 7 +++++ + 21 files changed, 93 insertions(+), 56 deletions(-) delete mode 100644 cameraserver/cameraserver-config.cmake create mode 100644 cameraserver/cameraserver-config.cmake.in delete mode 100644 cscore/cscore-config.cmake @@ -39,10 +40,25 @@ Subject: [PATCH] Update cmake find to support vcpkg libuv create mode 100644 wpiutil/wpiutil-config.cmake.in diff --git a/CMakeLists.txt b/CMakeLists.txt -index a5b89d9ac..f4e348e56 100644 +index a5b89d9ac..a8f82f95e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -72,20 +72,30 @@ else() +@@ -51,6 +51,7 @@ option(WITHOUT_ALLWPILIB "Don't build allwpilib (removes OpenCV requirement)" ON + option(USE_EXTERNAL_HAL "Use a separately built HAL" OFF) + set(EXTERNAL_HAL_FILE "" CACHE FILEPATH "Location to look for an external HAL CMake File") + option(USE_VCPKG_LIBUV "Use vcpkg libuv" OFF) ++option(FLAT_INSTALL_WPILIB "Use a flat install directory" OFF) + + if (NOT WITHOUT_JAVA AND NOT BUILD_SHARED_LIBS) + message(FATAL_ERROR " +@@ -66,26 +67,49 @@ set( main_lib_dest wpilib/lib ) + set( java_lib_dest wpilib/java ) + set( jni_lib_dest wpilib/jni ) + +-if (MSVC) ++if (MSVC OR FLAT_INSTALL_WPILIB) + set (wpilib_config_dir ${wpilib_dest}) + else() set (wpilib_config_dir share/wpilib) endif() @@ -50,8 +66,21 @@ index a5b89d9ac..f4e348e56 100644 +set (LIBUV_VCPKG_REPLACE "find_package(unofficial-libuv CONFIG)") +endif() + ++if (FLAT_INSTALL_WPILIB) +set(WPIUTIL_DEP_REPLACE "include($\{SELF_DIR\}/wpiutil-config.cmake)") +set(NTCORE_DEP_REPLACE "include($\{SELF_DIR\}/ntcore-config.cmake)") ++set(CSCORE_DEP_REPLACE_IMPL "include(\${SELF_DIR}/cscore-config.cmake)") ++set(CAMERASERVER_DEP_REPLACE_IMPL "include(\${SELF_DIR}/cameraserver-config.cmake)") ++set(HAL_DEP_REPLACE_IMPL "include(\${SELF_DIR}/hal-config.cmake)") ++set(WPILIBC_DEP_REPLACE_IMPL "include(\${SELF_DIR}/wpilibc-config.cmake)") ++else() ++set(WPIUTIL_DEP_REPLACE "find_dependency(wpiutil)") ++set(NTCORE_DEP_REPLACE "find_dependency(ntcore)") ++set(CSCORE_DEP_REPLACE_IMPL "find_dependency(cscore)") ++set(CAMERASERVER_DEP_REPLACE_IMPL "find_dependency(cameraserver)") ++set(HAL_DEP_REPLACE_IMPL "find_dependency(hal)") ++set(WPILIBC_DEP_REPLACE_IMPL "find_dependency(wpilibc)") ++endif() + +set(FILENAME_DEP_REPLACE "get_filename_component(SELF_DIR \"$\{CMAKE_CURRENT_LIST_FILE\}\" PATH)") +set(SELF_DIR "$\{SELF_DIR\}") @@ -60,15 +89,15 @@ index a5b89d9ac..f4e348e56 100644 add_subdirectory(ntcore) if (NOT WITHOUT_CSCORE) -+ set (CSCORE_DEP_REPLACE "include(\${SELF_DIR}/wpiutil-config.cmake)") -+ set (CAMERASERVER_DEP_REPLACE "include(\${SELF_DIR}/wpiutil-config.cmake)") ++ set(CSCORE_DEP_REPLACE ${CSCORE_DEP_REPLACE_IMPL}) ++ set(CAMERASERVER_DEP_REPLACE ${CAMERASERVER_DEP_REPLACE_IMPL}) add_subdirectory(cscore) add_subdirectory(cameraserver) - set (CSCORE_DEP_REPLACE "find_dependency(cscore)") - set (CAMERASERVER_DEP_REPLACE "find_dependency(cameraserver)") if (NOT WITHOUT_ALLWPILIB) -+ set (HAL_DEP_REPLACE "include(\${SELF_DIR}/hal-config.cmake)") -+ set (WPILIBC_DEP_REPLACE "include(\${SELF_DIR}/wpilibc-config.cmake)") ++ set(HAL_DEP_REPLACE ${HAL_DEP_REPLACE_IMPL}) ++ set(WPILIBC_DEP_REPLACE ${WPILIBC_DEP_REPLACE_IMPL}) add_subdirectory(hal) add_subdirectory(wpilibj) add_subdirectory(wpilibc) @@ -78,10 +107,17 @@ index a5b89d9ac..f4e348e56 100644 endif() diff --git a/cameraserver/CMakeLists.txt b/cameraserver/CMakeLists.txt -index a3a74607a..75a45ce69 100644 +index a3a74607a..1a75ae48d 100644 --- a/cameraserver/CMakeLists.txt +++ b/cameraserver/CMakeLists.txt -@@ -49,7 +49,8 @@ else() +@@ -43,13 +43,14 @@ if (NOT WITHOUT_JAVA AND MSVC) + install(TARGETS cameraserver RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) + endif() + +-if (MSVC) ++if (MSVC OR FLAT_INSTALL_WPILIB) + set (cameraserver_config_dir ${wpilib_dest}) + else() set (cameraserver_config_dir share/cameraserver) endif() @@ -121,10 +157,17 @@ index 000000000..0c71fc58c +include(${SELF_DIR}/cameraserver.cmake) + diff --git a/cscore/CMakeLists.txt b/cscore/CMakeLists.txt -index 52bcb54a2..f6675e29c 100644 +index 52bcb54a2..805b3a583 100644 --- a/cscore/CMakeLists.txt +++ b/cscore/CMakeLists.txt -@@ -42,7 +42,8 @@ else() +@@ -36,13 +36,14 @@ set_property(TARGET cscore PROPERTY FOLDER "libraries") + install(TARGETS cscore EXPORT cscore DESTINATION "${main_lib_dest}") + install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/cscore") + +-if (MSVC) ++if (MSVC OR FLAT_INSTALL_WPILIB) + set (cscore_config_dir ${wpilib_dest}) + else() set (cscore_config_dir share/cscore) endif() @@ -159,10 +202,17 @@ index 000000000..7894fbaec + +include(${SELF_DIR}/cscore.cmake) diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt -index e52d90ff0..3e338faec 100644 +index e52d90ff0..7394495db 100644 --- a/hal/CMakeLists.txt +++ b/hal/CMakeLists.txt -@@ -61,7 +61,8 @@ else() +@@ -55,13 +55,14 @@ install(TARGETS hal EXPORT hal DESTINATION "${main_lib_dest}") + install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/hal") + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gen DESTINATION "${include_dest}/hal") + +-if (MSVC) ++if (MSVC OR FLAT_INSTALL_WPILIB) + set (hal_config_dir ${wpilib_dest}) + else() set (hal_config_dir share/hal) endif() @@ -195,10 +245,17 @@ index 000000000..ae5533c27 + +include(${SELF_DIR}/hal.cmake) diff --git a/ntcore/CMakeLists.txt b/ntcore/CMakeLists.txt -index 47e226401..aaf6159b2 100644 +index 47e226401..1c00da138 100644 --- a/ntcore/CMakeLists.txt +++ b/ntcore/CMakeLists.txt -@@ -22,7 +22,8 @@ else() +@@ -16,13 +16,14 @@ set_property(TARGET ntcore PROPERTY FOLDER "libraries") + install(TARGETS ntcore EXPORT ntcore DESTINATION "${main_lib_dest}") + install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/ntcore") + +-if (MSVC) ++if (MSVC OR FLAT_INSTALL_WPILIB) + set (ntcore_config_dir ${wpilib_dest}) + else() set (ntcore_config_dir share/ntcore) endif() @@ -248,10 +305,17 @@ index 445db82d7..2c15dfe09 100644 @CAMERASERVER_DEP_REPLACE@ @HAL_DEP_REPLACE@ diff --git a/wpilibc/CMakeLists.txt b/wpilibc/CMakeLists.txt -index da3587188..e04d3df3f 100644 +index da3587188..7b131838b 100644 --- a/wpilibc/CMakeLists.txt +++ b/wpilibc/CMakeLists.txt -@@ -26,5 +26,6 @@ else() +@@ -20,11 +20,12 @@ set_property(TARGET wpilibc PROPERTY FOLDER "libraries") + install(TARGETS wpilibc EXPORT wpilibc DESTINATION "${main_lib_dest}") + install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/wpilibc") + +-if (MSVC) ++if (MSVC OR FLAT_INSTALL_WPILIB) + set (wpilibc_config_dir ${wpilib_dest}) + else() set (wpilibc_config_dir share/wpilibc) endif() @@ -290,11 +354,31 @@ index 000000000..4332c550e +@HAL_DEP_REPLACE@ + +include(${SELF_DIR}/wpilibc.cmake) +diff --git a/wpilibj/CMakeLists.txt b/wpilibj/CMakeLists.txt +index 61fb558fa..964fa0cc1 100644 +--- a/wpilibj/CMakeLists.txt ++++ b/wpilibj/CMakeLists.txt +@@ -23,7 +23,7 @@ if (NOT WITHOUT_JAVA) + + set_property(TARGET wpilibj_jar PROPERTY FOLDER "java") + +- if (MSVC) ++ if (MSVC OR FLAT_INSTALL_WPILIB) + set (wpilibj_config_dir ${wpilib_dest}) + else() + set (wpilibj_config_dir share/wpilibj) diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt -index bcc0bcf5b..653ab141d 100644 +index bcc0bcf5b..de66a9671 100644 --- a/wpiutil/CMakeLists.txt +++ b/wpiutil/CMakeLists.txt -@@ -130,7 +130,8 @@ else() +@@ -124,13 +124,14 @@ if (NOT WITHOUT_JAVA AND MSVC) + install(TARGETS wpiutil RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) + endif() + +-if (MSVC) ++if (MSVC OR FLAT_INSTALL_WPILIB) + set (wpiutil_config_dir ${wpilib_dest}) + else() set (wpiutil_config_dir share/wpiutil) endif() diff --git a/ports/wpilib/portfile.cmake b/ports/wpilib/portfile.cmake index 752de1d07..79853f6a0 100644 --- a/ports/wpilib/portfile.cmake +++ b/ports/wpilib/portfile.cmake @@ -31,6 +31,7 @@ vcpkg_configure_cmake( -DWITHOUT_CSCORE=${WITHOUT_CSCORE} -DWITHOUT_ALLWPILIB=${WITHOUT_ALLWPILIB} -DUSE_VCPKG_LIBUV=ON + -DFLAT_INSTALL_WPILIB=ON ) vcpkg_install_cmake() @@ -47,7 +48,7 @@ file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/cameraserver/ DESTINATION ${CUR file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/cscore/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) +if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dll") file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dll") -- cgit v1.2.3 From dd2100ee80b3dc458ecac5e55eaf00808651eb99 Mon Sep 17 00:00:00 2001 From: Thad House Date: Sun, 14 Apr 2019 10:44:42 -0700 Subject: VS 2019 support --- scripts/buildsystems/vcpkg.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 29bbd7523..1a6345563 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -39,10 +39,12 @@ else() set(_VCPKG_TARGET_TRIPLET_ARCH x86) elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 16 2019 Win64$") set(_VCPKG_TARGET_TRIPLET_ARCH x64) + elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 16 2019 Win32$") + set(_VCPKG_TARGET_TRIPLET_ARCH x86) elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 16 2019 ARM$") set(_VCPKG_TARGET_TRIPLET_ARCH arm) elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 16 2019$") - set(_VCPKG_TARGET_TRIPLET_ARCH x86) + set(_VCPKG_TARGET_TRIPLET_ARCH x64) else() find_program(_VCPKG_CL cl) if(_VCPKG_CL MATCHES "amd64/cl.exe$" OR _VCPKG_CL MATCHES "x64/cl.exe$") -- cgit v1.2.3 From b0a7ab2c53856a040eebcce25d8c5a5e28c2c577 Mon Sep 17 00:00:00 2001 From: Thad House Date: Tue, 16 Apr 2019 08:03:18 -0700 Subject: Update patch --- ports/wpilib/0001-Update-cmake-find-to-support-vcpkg-libuv.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/wpilib/0001-Update-cmake-find-to-support-vcpkg-libuv.patch b/ports/wpilib/0001-Update-cmake-find-to-support-vcpkg-libuv.patch index 6551be4ce..a461052df 100644 --- a/ports/wpilib/0001-Update-cmake-find-to-support-vcpkg-libuv.patch +++ b/ports/wpilib/0001-Update-cmake-find-to-support-vcpkg-libuv.patch @@ -1,8 +1,9 @@ -From 090e7210fcb8ba91268a21f174a26a66762bbaee Mon Sep 17 00:00:00 2001 +From 1cc701c3620b24440fdd7ad95683dca09e575008 Mon Sep 17 00:00:00 2001 From: Thad House Date: Sat, 13 Apr 2019 22:04:31 -0700 Subject: [PATCH] Update cmake find to support vcpkg libuv +Fix install on MSVC --- CMakeLists.txt | 34 +++++++++++++++++++---- cameraserver/CMakeLists.txt | 5 ++-- @@ -40,7 +41,7 @@ Subject: [PATCH] Update cmake find to support vcpkg libuv create mode 100644 wpiutil/wpiutil-config.cmake.in diff --git a/CMakeLists.txt b/CMakeLists.txt -index a5b89d9ac..a8f82f95e 100644 +index a5b89d9ac..20557d78e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,6 +51,7 @@ option(WITHOUT_ALLWPILIB "Don't build allwpilib (removes OpenCV requirement)" ON @@ -66,7 +67,7 @@ index a5b89d9ac..a8f82f95e 100644 +set (LIBUV_VCPKG_REPLACE "find_package(unofficial-libuv CONFIG)") +endif() + -+if (FLAT_INSTALL_WPILIB) ++if (MSVC OR FLAT_INSTALL_WPILIB) +set(WPIUTIL_DEP_REPLACE "include($\{SELF_DIR\}/wpiutil-config.cmake)") +set(NTCORE_DEP_REPLACE "include($\{SELF_DIR\}/ntcore-config.cmake)") +set(CSCORE_DEP_REPLACE_IMPL "include(\${SELF_DIR}/cscore-config.cmake)") -- cgit v1.2.3 From 50306ffe82b4d2bf432806fdfbff0b84f2a20a36 Mon Sep 17 00:00:00 2001 From: Thad House Date: Wed, 17 Apr 2019 11:45:44 -0700 Subject: More fixes --- ...ix-Gray-to-BGR-conversion-in-CameraServer.patch | 25 ++++++++++++++++++++++ ports/wpilib/portfile.cmake | 1 + 2 files changed, 26 insertions(+) create mode 100644 ports/wpilib/0001-Fix-Gray-to-BGR-conversion-in-CameraServer.patch diff --git a/ports/wpilib/0001-Fix-Gray-to-BGR-conversion-in-CameraServer.patch b/ports/wpilib/0001-Fix-Gray-to-BGR-conversion-in-CameraServer.patch new file mode 100644 index 000000000..d6e98cd24 --- /dev/null +++ b/ports/wpilib/0001-Fix-Gray-to-BGR-conversion-in-CameraServer.patch @@ -0,0 +1,25 @@ +From 087e27acc634e06860f8e32274d7eb01d90f6873 Mon Sep 17 00:00:00 2001 +From: Thad House +Date: Tue, 16 Apr 2019 13:31:15 -0700 +Subject: [PATCH] Fix Gray to BGR conversion in CameraServer + +--- + cscore/src/main/native/cpp/Frame.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cscore/src/main/native/cpp/Frame.cpp b/cscore/src/main/native/cpp/Frame.cpp +index 15f9b2d28..b21ec873a 100644 +--- a/cscore/src/main/native/cpp/Frame.cpp ++++ b/cscore/src/main/native/cpp/Frame.cpp +@@ -361,7 +361,7 @@ Image* Frame::ConvertBGRToGray(Image* image) { + } + + Image* Frame::ConvertGrayToBGR(Image* image) { +- if (!image || image->pixelFormat != VideoMode::kBGR) return nullptr; ++ if (!image || image->pixelFormat != VideoMode::kGray) return nullptr; + + // Allocate a BGR image + auto newImage = +-- +2.18.0.windows.1 + diff --git a/ports/wpilib/portfile.cmake b/ports/wpilib/portfile.cmake index 79853f6a0..3289333fa 100644 --- a/ports/wpilib/portfile.cmake +++ b/ports/wpilib/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( HEAD_REF vcpkgrelease PATCHES 0001-Update-cmake-find-to-support-vcpkg-libuv.patch + 0001-Fix-Gray-to-BGR-conversion-in-CameraServer.patch ) set(WITHOUT_JAVA ON) -- cgit v1.2.3 From f483ae4c7fd04eed671a1de595374f84175311e9 Mon Sep 17 00:00:00 2001 From: Thad House Date: Fri, 31 May 2019 13:46:43 -0700 Subject: Remove wpilib shims --- ...ix-Gray-to-BGR-conversion-in-CameraServer.patch | 25 -- ...-Update-cmake-find-to-support-vcpkg-libuv.patch | 415 --------------------- ports/wpilib/portfile.cmake | 8 +- 3 files changed, 2 insertions(+), 446 deletions(-) delete mode 100644 ports/wpilib/0001-Fix-Gray-to-BGR-conversion-in-CameraServer.patch delete mode 100644 ports/wpilib/0001-Update-cmake-find-to-support-vcpkg-libuv.patch diff --git a/ports/wpilib/0001-Fix-Gray-to-BGR-conversion-in-CameraServer.patch b/ports/wpilib/0001-Fix-Gray-to-BGR-conversion-in-CameraServer.patch deleted file mode 100644 index d6e98cd24..000000000 --- a/ports/wpilib/0001-Fix-Gray-to-BGR-conversion-in-CameraServer.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 087e27acc634e06860f8e32274d7eb01d90f6873 Mon Sep 17 00:00:00 2001 -From: Thad House -Date: Tue, 16 Apr 2019 13:31:15 -0700 -Subject: [PATCH] Fix Gray to BGR conversion in CameraServer - ---- - cscore/src/main/native/cpp/Frame.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cscore/src/main/native/cpp/Frame.cpp b/cscore/src/main/native/cpp/Frame.cpp -index 15f9b2d28..b21ec873a 100644 ---- a/cscore/src/main/native/cpp/Frame.cpp -+++ b/cscore/src/main/native/cpp/Frame.cpp -@@ -361,7 +361,7 @@ Image* Frame::ConvertBGRToGray(Image* image) { - } - - Image* Frame::ConvertGrayToBGR(Image* image) { -- if (!image || image->pixelFormat != VideoMode::kBGR) return nullptr; -+ if (!image || image->pixelFormat != VideoMode::kGray) return nullptr; - - // Allocate a BGR image - auto newImage = --- -2.18.0.windows.1 - diff --git a/ports/wpilib/0001-Update-cmake-find-to-support-vcpkg-libuv.patch b/ports/wpilib/0001-Update-cmake-find-to-support-vcpkg-libuv.patch deleted file mode 100644 index a461052df..000000000 --- a/ports/wpilib/0001-Update-cmake-find-to-support-vcpkg-libuv.patch +++ /dev/null @@ -1,415 +0,0 @@ -From 1cc701c3620b24440fdd7ad95683dca09e575008 Mon Sep 17 00:00:00 2001 -From: Thad House -Date: Sat, 13 Apr 2019 22:04:31 -0700 -Subject: [PATCH] Update cmake find to support vcpkg libuv - -Fix install on MSVC ---- - CMakeLists.txt | 34 +++++++++++++++++++---- - cameraserver/CMakeLists.txt | 5 ++-- - cameraserver/cameraserver-config.cmake | 8 ------ - cameraserver/cameraserver-config.cmake.in | 9 ++++++ - cscore/CMakeLists.txt | 5 ++-- - cscore/cscore-config.cmake | 6 ---- - cscore/cscore-config.cmake.in | 6 ++++ - hal/CMakeLists.txt | 5 ++-- - hal/hal-config.cmake | 5 ---- - hal/hal-config.cmake.in | 5 ++++ - ntcore/CMakeLists.txt | 5 ++-- - ntcore/ntcore-config.cmake | 5 ---- - ntcore/ntcore-config.cmake.in | 5 ++++ - wpilib-config.cmake.in | 6 ++-- - wpilibc/CMakeLists.txt | 5 ++-- - wpilibc/wpilibc-config.cmake | 10 ------- - wpilibc/wpilibc-config.cmake.in | 9 ++++++ - wpilibj/CMakeLists.txt | 2 +- - wpiutil/CMakeLists.txt | 5 ++-- - wpiutil/wpiutil-config.cmake | 2 -- - wpiutil/wpiutil-config.cmake.in | 7 +++++ - 21 files changed, 93 insertions(+), 56 deletions(-) - delete mode 100644 cameraserver/cameraserver-config.cmake - create mode 100644 cameraserver/cameraserver-config.cmake.in - delete mode 100644 cscore/cscore-config.cmake - create mode 100644 cscore/cscore-config.cmake.in - delete mode 100644 hal/hal-config.cmake - create mode 100644 hal/hal-config.cmake.in - delete mode 100644 ntcore/ntcore-config.cmake - create mode 100644 ntcore/ntcore-config.cmake.in - delete mode 100644 wpilibc/wpilibc-config.cmake - create mode 100644 wpilibc/wpilibc-config.cmake.in - delete mode 100644 wpiutil/wpiutil-config.cmake - create mode 100644 wpiutil/wpiutil-config.cmake.in - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a5b89d9ac..20557d78e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -51,6 +51,7 @@ option(WITHOUT_ALLWPILIB "Don't build allwpilib (removes OpenCV requirement)" ON - option(USE_EXTERNAL_HAL "Use a separately built HAL" OFF) - set(EXTERNAL_HAL_FILE "" CACHE FILEPATH "Location to look for an external HAL CMake File") - option(USE_VCPKG_LIBUV "Use vcpkg libuv" OFF) -+option(FLAT_INSTALL_WPILIB "Use a flat install directory" OFF) - - if (NOT WITHOUT_JAVA AND NOT BUILD_SHARED_LIBS) - message(FATAL_ERROR " -@@ -66,26 +67,49 @@ set( main_lib_dest wpilib/lib ) - set( java_lib_dest wpilib/java ) - set( jni_lib_dest wpilib/jni ) - --if (MSVC) -+if (MSVC OR FLAT_INSTALL_WPILIB) - set (wpilib_config_dir ${wpilib_dest}) - else() - set (wpilib_config_dir share/wpilib) - endif() - -+if (USE_VCPKG_LIBUV) -+set (LIBUV_VCPKG_REPLACE "find_package(unofficial-libuv CONFIG)") -+endif() -+ -+if (MSVC OR FLAT_INSTALL_WPILIB) -+set(WPIUTIL_DEP_REPLACE "include($\{SELF_DIR\}/wpiutil-config.cmake)") -+set(NTCORE_DEP_REPLACE "include($\{SELF_DIR\}/ntcore-config.cmake)") -+set(CSCORE_DEP_REPLACE_IMPL "include(\${SELF_DIR}/cscore-config.cmake)") -+set(CAMERASERVER_DEP_REPLACE_IMPL "include(\${SELF_DIR}/cameraserver-config.cmake)") -+set(HAL_DEP_REPLACE_IMPL "include(\${SELF_DIR}/hal-config.cmake)") -+set(WPILIBC_DEP_REPLACE_IMPL "include(\${SELF_DIR}/wpilibc-config.cmake)") -+else() -+set(WPIUTIL_DEP_REPLACE "find_dependency(wpiutil)") -+set(NTCORE_DEP_REPLACE "find_dependency(ntcore)") -+set(CSCORE_DEP_REPLACE_IMPL "find_dependency(cscore)") -+set(CAMERASERVER_DEP_REPLACE_IMPL "find_dependency(cameraserver)") -+set(HAL_DEP_REPLACE_IMPL "find_dependency(hal)") -+set(WPILIBC_DEP_REPLACE_IMPL "find_dependency(wpilibc)") -+endif() -+ -+set(FILENAME_DEP_REPLACE "get_filename_component(SELF_DIR \"$\{CMAKE_CURRENT_LIST_FILE\}\" PATH)") -+set(SELF_DIR "$\{SELF_DIR\}") -+ - add_subdirectory(wpiutil) - add_subdirectory(ntcore) - - if (NOT WITHOUT_CSCORE) -+ set(CSCORE_DEP_REPLACE ${CSCORE_DEP_REPLACE_IMPL}) -+ set(CAMERASERVER_DEP_REPLACE ${CAMERASERVER_DEP_REPLACE_IMPL}) - add_subdirectory(cscore) - add_subdirectory(cameraserver) -- set (CSCORE_DEP_REPLACE "find_dependency(cscore)") -- set (CAMERASERVER_DEP_REPLACE "find_dependency(cameraserver)") - if (NOT WITHOUT_ALLWPILIB) -+ set(HAL_DEP_REPLACE ${HAL_DEP_REPLACE_IMPL}) -+ set(WPILIBC_DEP_REPLACE ${WPILIBC_DEP_REPLACE_IMPL}) - add_subdirectory(hal) - add_subdirectory(wpilibj) - add_subdirectory(wpilibc) -- set (HAL_DEP_REPLACE "find_dependency(hal)") -- set (WPILIBC_DEP_REPLACE "find_dependency(wpilibc)") - endif() - endif() - -diff --git a/cameraserver/CMakeLists.txt b/cameraserver/CMakeLists.txt -index a3a74607a..1a75ae48d 100644 ---- a/cameraserver/CMakeLists.txt -+++ b/cameraserver/CMakeLists.txt -@@ -43,13 +43,14 @@ if (NOT WITHOUT_JAVA AND MSVC) - install(TARGETS cameraserver RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) - endif() - --if (MSVC) -+if (MSVC OR FLAT_INSTALL_WPILIB) - set (cameraserver_config_dir ${wpilib_dest}) - else() - set (cameraserver_config_dir share/cameraserver) - endif() - --install(FILES cameraserver-config.cmake DESTINATION ${cameraserver_config_dir}) -+configure_file(cameraserver-config.cmake.in ${CMAKE_BINARY_DIR}/cameraserver-config.cmake ) -+install(FILES ${CMAKE_BINARY_DIR}/cameraserver-config.cmake DESTINATION ${cameraserver_config_dir}) - install(EXPORT cameraserver DESTINATION ${cameraserver_config_dir}) - - file(GLOB multiCameraServer_src multiCameraServer/src/main/native/cpp/*.cpp) -diff --git a/cameraserver/cameraserver-config.cmake b/cameraserver/cameraserver-config.cmake -deleted file mode 100644 -index 2c2b1cc33..000000000 ---- a/cameraserver/cameraserver-config.cmake -+++ /dev/null -@@ -1,8 +0,0 @@ --include(CMakeFindDependencyMacro) --find_dependency(wpiutil) --find_dependency(ntcore) --find_dependency(cscore) --find_dependency(OpenCV) -- --get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) --include(${SELF_DIR}/cameraserver.cmake) -diff --git a/cameraserver/cameraserver-config.cmake.in b/cameraserver/cameraserver-config.cmake.in -new file mode 100644 -index 000000000..0c71fc58c ---- /dev/null -+++ b/cameraserver/cameraserver-config.cmake.in -@@ -0,0 +1,9 @@ -+include(CMakeFindDependencyMacro) -+@FILENAME_DEP_REPLACE@ -+@WPIUTIL_DEP_REPLACE@ -+@NTCORE_DEP_REPLACE@ -+@CSCORE_DEP_REPLACE@ -+find_dependency(OpenCV) -+ -+include(${SELF_DIR}/cameraserver.cmake) -+ -diff --git a/cscore/CMakeLists.txt b/cscore/CMakeLists.txt -index 52bcb54a2..805b3a583 100644 ---- a/cscore/CMakeLists.txt -+++ b/cscore/CMakeLists.txt -@@ -36,13 +36,14 @@ set_property(TARGET cscore PROPERTY FOLDER "libraries") - install(TARGETS cscore EXPORT cscore DESTINATION "${main_lib_dest}") - install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/cscore") - --if (MSVC) -+if (MSVC OR FLAT_INSTALL_WPILIB) - set (cscore_config_dir ${wpilib_dest}) - else() - set (cscore_config_dir share/cscore) - endif() - --install(FILES cscore-config.cmake DESTINATION ${cscore_config_dir}) -+configure_file(cscore-config.cmake.in ${CMAKE_BINARY_DIR}/cscore-config.cmake ) -+install(FILES ${CMAKE_BINARY_DIR}/cscore-config.cmake DESTINATION ${cscore_config_dir}) - install(EXPORT cscore DESTINATION ${cscore_config_dir}) - - SUBDIR_LIST(cscore_examples "${CMAKE_CURRENT_SOURCE_DIR}/examples") -diff --git a/cscore/cscore-config.cmake b/cscore/cscore-config.cmake -deleted file mode 100644 -index 790633b87..000000000 ---- a/cscore/cscore-config.cmake -+++ /dev/null -@@ -1,6 +0,0 @@ --include(CMakeFindDependencyMacro) --find_dependency(wpiutil) --find_dependency(OpenCV) -- --get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) --include(${SELF_DIR}/cscore.cmake) -diff --git a/cscore/cscore-config.cmake.in b/cscore/cscore-config.cmake.in -new file mode 100644 -index 000000000..7894fbaec ---- /dev/null -+++ b/cscore/cscore-config.cmake.in -@@ -0,0 +1,6 @@ -+include(CMakeFindDependencyMacro) -+@FILENAME_DEP_REPLACE@ -+@WPIUTIL_DEP_REPLACE@ -+find_dependency(OpenCV) -+ -+include(${SELF_DIR}/cscore.cmake) -diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt -index e52d90ff0..7394495db 100644 ---- a/hal/CMakeLists.txt -+++ b/hal/CMakeLists.txt -@@ -55,13 +55,14 @@ install(TARGETS hal EXPORT hal DESTINATION "${main_lib_dest}") - install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/hal") - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gen DESTINATION "${include_dest}/hal") - --if (MSVC) -+if (MSVC OR FLAT_INSTALL_WPILIB) - set (hal_config_dir ${wpilib_dest}) - else() - set (hal_config_dir share/hal) - endif() - --install(FILES hal-config.cmake DESTINATION ${hal_config_dir}) -+configure_file(hal-config.cmake.in ${CMAKE_BINARY_DIR}/hal-config.cmake ) -+install(FILES ${CMAKE_BINARY_DIR}/hal-config.cmake DESTINATION ${hal_config_dir}) - install(EXPORT hal DESTINATION ${hal_config_dir}) - - # Java bindings -diff --git a/hal/hal-config.cmake b/hal/hal-config.cmake -deleted file mode 100644 -index 97a574ebf..000000000 ---- a/hal/hal-config.cmake -+++ /dev/null -@@ -1,5 +0,0 @@ --include(CMakeFindDependencyMacro) --find_dependency(wpiutil) -- --get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) --include(${SELF_DIR}/hal.cmake) -diff --git a/hal/hal-config.cmake.in b/hal/hal-config.cmake.in -new file mode 100644 -index 000000000..ae5533c27 ---- /dev/null -+++ b/hal/hal-config.cmake.in -@@ -0,0 +1,5 @@ -+include(CMakeFindDependencyMacro) -+@FILENAME_DEP_REPLACE@ -+@WPIUTIL_DEP_REPLACE@ -+ -+include(${SELF_DIR}/hal.cmake) -diff --git a/ntcore/CMakeLists.txt b/ntcore/CMakeLists.txt -index 47e226401..1c00da138 100644 ---- a/ntcore/CMakeLists.txt -+++ b/ntcore/CMakeLists.txt -@@ -16,13 +16,14 @@ set_property(TARGET ntcore PROPERTY FOLDER "libraries") - install(TARGETS ntcore EXPORT ntcore DESTINATION "${main_lib_dest}") - install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/ntcore") - --if (MSVC) -+if (MSVC OR FLAT_INSTALL_WPILIB) - set (ntcore_config_dir ${wpilib_dest}) - else() - set (ntcore_config_dir share/ntcore) - endif() - --install(FILES ntcore-config.cmake DESTINATION ${ntcore_config_dir}) -+configure_file(ntcore-config.cmake.in ${CMAKE_BINARY_DIR}/ntcore-config.cmake ) -+install(FILES ${CMAKE_BINARY_DIR}/ntcore-config.cmake DESTINATION ${ntcore_config_dir}) - install(EXPORT ntcore DESTINATION ${ntcore_config_dir}) - - # Java bindings -diff --git a/ntcore/ntcore-config.cmake b/ntcore/ntcore-config.cmake -deleted file mode 100644 -index 6be1dda4a..000000000 ---- a/ntcore/ntcore-config.cmake -+++ /dev/null -@@ -1,5 +0,0 @@ --include(CMakeFindDependencyMacro) --find_dependency(wpiutil) -- --get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) --include(${SELF_DIR}/ntcore.cmake) -diff --git a/ntcore/ntcore-config.cmake.in b/ntcore/ntcore-config.cmake.in -new file mode 100644 -index 000000000..1e950e90c ---- /dev/null -+++ b/ntcore/ntcore-config.cmake.in -@@ -0,0 +1,5 @@ -+include(CMakeFindDependencyMacro) -+@FILENAME_DEP_REPLACE@ -+@WPIUTIL_DEP_REPLACE@ -+ -+include(${SELF_DIR}/ntcore.cmake) -diff --git a/wpilib-config.cmake.in b/wpilib-config.cmake.in -index 445db82d7..2c15dfe09 100644 ---- a/wpilib-config.cmake.in -+++ b/wpilib-config.cmake.in -@@ -1,8 +1,10 @@ - include(CMakeFindDependencyMacro) -+@FILENAME_DEP_REPLACE@ - set(THREADS_PREFER_PTHREAD_FLAG ON) - find_dependency(Threads) --find_dependency(wpiutil) --find_dependency(ntcore) -+@LIBUV_VCPKG_REPLACE@ -+@WPIUTIL_DEP_REPLACE@ -+@NTCORE_DEP_REPLACE@ - @CSCORE_DEP_REPLACE@ - @CAMERASERVER_DEP_REPLACE@ - @HAL_DEP_REPLACE@ -diff --git a/wpilibc/CMakeLists.txt b/wpilibc/CMakeLists.txt -index da3587188..7b131838b 100644 ---- a/wpilibc/CMakeLists.txt -+++ b/wpilibc/CMakeLists.txt -@@ -20,11 +20,12 @@ set_property(TARGET wpilibc PROPERTY FOLDER "libraries") - install(TARGETS wpilibc EXPORT wpilibc DESTINATION "${main_lib_dest}") - install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/wpilibc") - --if (MSVC) -+if (MSVC OR FLAT_INSTALL_WPILIB) - set (wpilibc_config_dir ${wpilib_dest}) - else() - set (wpilibc_config_dir share/wpilibc) - endif() - --install(FILES wpilibc-config.cmake DESTINATION ${wpilibc_config_dir}) -+configure_file(wpilibc-config.cmake.in ${CMAKE_BINARY_DIR}/wpilibc-config.cmake ) -+install(FILES ${CMAKE_BINARY_DIR}/wpilibc-config.cmake DESTINATION ${wpilibc_config_dir}) - install(EXPORT wpilibc DESTINATION ${wpilibc_config_dir}) -diff --git a/wpilibc/wpilibc-config.cmake b/wpilibc/wpilibc-config.cmake -deleted file mode 100644 -index 86f077c71..000000000 ---- a/wpilibc/wpilibc-config.cmake -+++ /dev/null -@@ -1,10 +0,0 @@ --include(CMakeFindDependencyMacro) --find_dependency(wpiutil) --find_dependency(ntcore) --find_dependency(cscore) --find_dependency(cameraserver) --find_dependency(hal) --find_dependency(OpenCV) -- --get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) --include(${SELF_DIR}/wpilibc.cmake) -diff --git a/wpilibc/wpilibc-config.cmake.in b/wpilibc/wpilibc-config.cmake.in -new file mode 100644 -index 000000000..4332c550e ---- /dev/null -+++ b/wpilibc/wpilibc-config.cmake.in -@@ -0,0 +1,9 @@ -+include(CMakeFindDependencyMacro) -+@FILENAME_DEP_REPLACE@ -+@WPIUTIL_DEP_REPLACE@ -+@NTCORE_DEP_REPLACE@ -+@CSCORE_DEP_REPLACE@ -+@CAMERASERVER_DEP_REPLACE@ -+@HAL_DEP_REPLACE@ -+ -+include(${SELF_DIR}/wpilibc.cmake) -diff --git a/wpilibj/CMakeLists.txt b/wpilibj/CMakeLists.txt -index 61fb558fa..964fa0cc1 100644 ---- a/wpilibj/CMakeLists.txt -+++ b/wpilibj/CMakeLists.txt -@@ -23,7 +23,7 @@ if (NOT WITHOUT_JAVA) - - set_property(TARGET wpilibj_jar PROPERTY FOLDER "java") - -- if (MSVC) -+ if (MSVC OR FLAT_INSTALL_WPILIB) - set (wpilibj_config_dir ${wpilib_dest}) - else() - set (wpilibj_config_dir share/wpilibj) -diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt -index bcc0bcf5b..de66a9671 100644 ---- a/wpiutil/CMakeLists.txt -+++ b/wpiutil/CMakeLists.txt -@@ -124,13 +124,14 @@ if (NOT WITHOUT_JAVA AND MSVC) - install(TARGETS wpiutil RUNTIME DESTINATION "${jni_lib_dest}" COMPONENT Runtime) - endif() - --if (MSVC) -+if (MSVC OR FLAT_INSTALL_WPILIB) - set (wpiutil_config_dir ${wpilib_dest}) - else() - set (wpiutil_config_dir share/wpiutil) - endif() - --install(FILES wpiutil-config.cmake DESTINATION ${wpiutil_config_dir}) -+configure_file(wpiutil-config.cmake.in ${CMAKE_BINARY_DIR}/wpiutil-config.cmake ) -+install(FILES ${CMAKE_BINARY_DIR}/wpiutil-config.cmake DESTINATION ${wpiutil_config_dir}) - install(EXPORT wpiutil DESTINATION ${wpiutil_config_dir}) - - SUBDIR_LIST(wpiutil_examples "${CMAKE_CURRENT_SOURCE_DIR}/examples") -diff --git a/wpiutil/wpiutil-config.cmake b/wpiutil/wpiutil-config.cmake -deleted file mode 100644 -index 91d01a77c..000000000 ---- a/wpiutil/wpiutil-config.cmake -+++ /dev/null -@@ -1,2 +0,0 @@ --get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) --include(${SELF_DIR}/wpiutil.cmake) -diff --git a/wpiutil/wpiutil-config.cmake.in b/wpiutil/wpiutil-config.cmake.in -new file mode 100644 -index 000000000..5d71bc192 ---- /dev/null -+++ b/wpiutil/wpiutil-config.cmake.in -@@ -0,0 +1,7 @@ -+include(CMakeFindDependencyMacro) -+@FILENAME_DEP_REPLACE@ -+set(THREADS_PREFER_PTHREAD_FLAG ON) -+find_dependency(Threads) -+@LIBUV_VCPKG_REPLACE@ -+ -+include(${SELF_DIR}/wpiutil.cmake) --- -2.18.0.windows.1 - diff --git a/ports/wpilib/portfile.cmake b/ports/wpilib/portfile.cmake index 3289333fa..2e77c0165 100644 --- a/ports/wpilib/portfile.cmake +++ b/ports/wpilib/portfile.cmake @@ -2,13 +2,9 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO thadhouse/allwpilib - REF v2019.42.42 + REPO wpilibsuite/allwpilib + REF 221011494d202770ad275c88cd7380119505e65d SHA512 fd8d1030bffe67912c09e6dd9aedd71be10a5994aae9d371eb7a0b0faa67bc2743a16d9c31a4472f933819d3d109c676d506df7ca6df46ca68ec92290d3a8a47 - HEAD_REF vcpkgrelease - PATCHES - 0001-Update-cmake-find-to-support-vcpkg-libuv.patch - 0001-Fix-Gray-to-BGR-conversion-in-CameraServer.patch ) set(WITHOUT_JAVA ON) -- cgit v1.2.3 From 94cf18d119e2f76ed429a78852d69890f70db8bc Mon Sep 17 00:00:00 2001 From: Thad House Date: Fri, 31 May 2019 13:50:30 -0700 Subject: Fix vcpkg things --- scripts/buildsystems/vcpkg.cmake | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index b83fcb1ca..f657e2710 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -107,11 +107,7 @@ if(NOT EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" AND NOT _CMAKE_I message(WARNING "There are no libraries installed for the Vcpkg triplet ${VCPKG_TARGET_TRIPLET}.") endif() -<<<<<<< HEAD -if(CMAKE_BUILD_TYPE MATCHES "^Debug$" OR NOT DEFINED CMAKE_BUILD_TYPE) #Debug build: Put Debug paths before Release paths. -======= if(CMAKE_BUILD_TYPE MATCHES "^[Dd][Ee][Bb][Uu][Gg]$" OR NOT DEFINED CMAKE_BUILD_TYPE) #Debug build: Put Debug paths before Release paths. ->>>>>>> upstream/master list(APPEND CMAKE_PREFIX_PATH ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET} ) -- cgit v1.2.3 From d21b44f019d483f579ce7ba33c31420727fd474c Mon Sep 17 00:00:00 2001 From: Thad House Date: Fri, 31 May 2019 14:21:22 -0700 Subject: Add hash for wpilib --- ports/wpilib/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/wpilib/portfile.cmake b/ports/wpilib/portfile.cmake index 2e77c0165..4bb8b80a5 100644 --- a/ports/wpilib/portfile.cmake +++ b/ports/wpilib/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wpilibsuite/allwpilib REF 221011494d202770ad275c88cd7380119505e65d - SHA512 fd8d1030bffe67912c09e6dd9aedd71be10a5994aae9d371eb7a0b0faa67bc2743a16d9c31a4472f933819d3d109c676d506df7ca6df46ca68ec92290d3a8a47 + SHA512 97ec277b2e7d0a287e1d4eef4f60b5f5b5a70a861f984d0bfb17610ca8f43c723e1ba3cc1b428d243db62b50307edcf509e496f15cccdda78f962bf91aa4568a ) set(WITHOUT_JAVA ON) -- cgit v1.2.3