From e79fa91d9c396b99a3e5b22d1a0604bf0f7ba701 Mon Sep 17 00:00:00 2001 From: Davide Gerhard Date: Thu, 23 May 2019 11:58:50 +0200 Subject: [PATCH] update external/windows libs with pkg-config-lite --- CMakeLists.txt | 13 +++++++------ external/windows | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 43a30a05d..2f75d2a51 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -156,12 +156,13 @@ elseif(APPLE) elseif (WIN32) set(EXTERNAL_LIBRARY_FOLDER "${CMAKE_SOURCE_DIR}/external/windows") set(BOOST_ROOT "${EXTERNAL_LIBRARY_FOLDER}/boot") - set(FFTW3F_INCLUDE_DIRS="${EXTERNAL_LIBRARY_FOLDER}/fftw-3/include") - set(FFTW3F_LIBRARIES="${EXTERNAL_LIBRARY_FOLDER}/fftw-3/libfftw3f-3.dll") - set(LIBUSB_INCLUDE_DIR="${EXTERNAL_LIBRARY_FOLDER}/libusb/include") - set(LIBUSB_LIBRARIES="${EXTERNAL_LIBRARY_FOLDER}/libusb/libusb-1.0.x64.dll") - set(OpenCV_INCLUDE_DIRS="${EXTERNAL_LIBRARY_FOLDER}/opencv/include") - set(OpenCV_LIBS="${EXTERNAL_LIBRARY_FOLDER}/opencv/opencv_ffmpeg410_64.dll") + set(FFTW3F_INCLUDE_DIRS "${EXTERNAL_LIBRARY_FOLDER}/fftw-3/include") + set(FFTW3F_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/fftw-3/libfftw3f-3.dll") + set(LIBUSB_INCLUDE_DIR "${EXTERNAL_LIBRARY_FOLDER}/libusb/include") + set(LIBUSB_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/libusb/libusb-1.0.x64.dll") + set(OpenCV_INCLUDE_DIRS "${EXTERNAL_LIBRARY_FOLDER}/opencv/include") + set(OpenCV_LIBS "${EXTERNAL_LIBRARY_FOLDER}/opencv/opencv_ffmpeg410_64.dll") + set(PKG_CONFIG_EXECUTABLE "${EXTERNAL_LIBRARY_FOLDER}/pkg-config-lite/bin/pkg-config.exe") endif() # TODO: check if(DEFINED) and fix macports -D diff --git a/external/windows b/external/windows index c07931996..66a1b6495 160000 --- a/external/windows +++ b/external/windows @@ -1 +1 @@ -Subproject commit c079319960c0f3e48ec51bbfea716c0cbc8581de +Subproject commit 66a1b6495e6ba2906e38e2e1b4609da1d437f0c4