From 781224e2598c022b0da84b82ec4efe6f3e67510e Mon Sep 17 00:00:00 2001 From: Magnus Jacobsson Date: Wed, 16 Sep 2020 08:10:36 +0200 Subject: [PATCH] Add preinstalled getopt vcpkg library to CMake --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e1168ea7..4536df2d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,10 +59,13 @@ set(TOP_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") set(TOP_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}") set(GRAPHVIZ_LIB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lib") set(WINDOWS_DEPENDENCY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/windows/dependencies/libraries") +set(WINDOWS_DEPENDENCY_VCPKG_DIR "${CMAKE_CURRENT_SOURCE_DIR}/windows/dependencies/libraries/vcpkg/installed") if (CMAKE_CL_64) set(WINDOWS_DEPENDENCY_DIR "${WINDOWS_DEPENDENCY_DIR}/x64") + set(WINDOWS_DEPENDENCY_VCPKG_DIR "${WINDOWS_DEPENDENCY_VCPKG_DIR}/x64-windows") else() set(WINDOWS_DEPENDENCY_DIR "${WINDOWS_DEPENDENCY_DIR}/x86") + set(WINDOWS_DEPENDENCY_VCPKG_DIR "${WINDOWS_DEPENDENCY_VCPKG_DIR}/x86-windows") endif() set(GRAPHVIZ_PLUGIN_VERSION 6) @@ -72,6 +75,7 @@ set(GVPLUGIN_CONFIG_FILE config${GRAPHVIZ_PLUGIN_VERSION}) # ============================ Library dependencies ============================ if (WIN32) list(APPEND CMAKE_PREFIX_PATH ${WINDOWS_DEPENDENCY_DIR}) + list(APPEND CMAKE_PREFIX_PATH ${WINDOWS_DEPENDENCY_VCPKG_DIR}) else() list(APPEND CMAKE_INCLUDE_PATH /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu) endif() -- 2.40.0