aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPřemysl Janouch <p@janouch.name>2018-06-25 02:02:26 +0200
committerPřemysl Janouch <p@janouch.name>2018-06-25 02:34:35 +0200
commit193b7247090a466d508135d911a4c61b5c429dfa (patch)
tree2c4e5cc1858dd58cd971e8c290319c3af0b6a9eb
parentb5af31b048e3d78343d82bd713946caa5fac6690 (diff)
downloadlogdiag-193b7247090a466d508135d911a4c61b5c429dfa.tar.gz
logdiag-193b7247090a466d508135d911a4c61b5c429dfa.tar.xz
logdiag-193b7247090a466d508135d911a4c61b5c429dfa.zip
Workaround a CMake/pkg-config regression
-rw-r--r--CMakeLists.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 206c93c..58ddccb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,10 @@ if (WIN32)
list (APPEND CMAKE_FIND_ROOT_PATH ${WIN32_DEPENDS_PATH})
endif (CMAKE_CROSSCOMPILING)
- set (PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE)
+ set (PKG_CONFIG_USE_CMAKE_PREFIX_PATH FALSE)
+ # Seems like there is a regression setting this to two paths in one,
+ # setting the path manually
+ set (ENV{PKG_CONFIG_PATH} "${WIN32_DEPENDS_PATH}/lib/pkgconfig")
add_custom_target (win32-depends COMMAND ${CMAKE_COMMAND} -P
${PROJECT_SOURCE_DIR}/Win32Depends.cmake