1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
diff --git a/cmake/FindCairo.cmake b/cmake/FindCairo.cmake
index dce05ea96..cbd879fee 100644
--- a/cmake/FindCairo.cmake
+++ b/cmake/FindCairo.cmake
@@ -1,6 +1,6 @@
include(FindPackageHandleStandardArgs)
-if (WIN32)
+if (false)
find_path(Cairo_INCLUDE_DIR cairo/cairo.h)
find_library(Cairo_LIBRARY NAMES cairo)
diff --git a/cmake/FindPangoCairo.cmake b/cmake/FindPangoCairo.cmake
index 0937e41ef..bb876ce46 100644
--- a/cmake/FindPangoCairo.cmake
+++ b/cmake/FindPangoCairo.cmake
@@ -1,6 +1,6 @@
include(FindPackageHandleStandardArgs)
-if (WIN32)
+if (false)
find_path(PangoCairo_INCLUDE_DIR pango/pangocairo.h PATH_SUFFIXES pango-1.0)
find_path(GLIB_INCLUDE_DIR glib.h PATH_SUFFIXES glib-2.0)
find_path(GLIBCONFIG_INCLUDE_DIR glibconfig.h PATH_SUFFIXES glib-2.0/include)
@@ -69,6 +69,9 @@ if (WIN32)
else()
find_package(PkgConfig)
pkg_check_modules(PangoCairo pangocairo)
+ list(REMOVE_ITEM PangoCairo_LINK_LIBRARIES ffi)
+ find_library(ACTUAL_FFI libffi PangoCairo_LIBRARY_DIRS)
+ list(APPEND PangoCairo_LINK_LIBRARIES ${ACTUAL_FFI})
# prior to CMake 3.12, PkgConfig does not set *_LINK_LIBRARIES, so do it
# manually
diff --git a/cmd/tools/CMakeLists.txt b/cmd/tools/CMakeLists.txt
index 8d7b88484..58f8d80fe 100644
--- a/cmd/tools/CMakeLists.txt
+++ b/cmd/tools/CMakeLists.txt
@@ -392,14 +392,14 @@ tool_defaults(sccmap)
# ===================== Install third party DLLs on Windows ====================
-if (WIN32 AND EXPAT_FOUND)
+if (false)
install(
FILES ${EXPAT_RUNTIME_LIBRARIES}
DESTINATION ${BINARY_INSTALL_DIR}
)
-endif(WIN32 AND EXPAT_FOUND)
+endif(false)
-if (WIN32)
+if (false)
install(
FILES ${Getopt_RUNTIME_LIBRARIES}
DESTINATION ${BINARY_INSTALL_DIR}
diff --git a/lib/common/CMakeLists.txt b/lib/common/CMakeLists.txt
index 144c442ae..fa56739b0 100644
--- a/lib/common/CMakeLists.txt
+++ b/lib/common/CMakeLists.txt
@@ -93,6 +93,7 @@ target_include_directories(common_obj PRIVATE
${GRAPHVIZ_LIB_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
+ ${EXPAT_INCLUDE_DIRS}
${GRAPHVIZ_LIB_DIR}/cdt
${GRAPHVIZ_LIB_DIR}/cgraph
${GRAPHVIZ_LIB_DIR}/gvc
diff --git a/lib/gvc/CMakeLists.txt b/lib/gvc/CMakeLists.txt
index 745841176..57e2dd32b 100644
--- a/lib/gvc/CMakeLists.txt
+++ b/lib/gvc/CMakeLists.txt
@@ -134,7 +134,7 @@ set_target_properties(gvc PROPERTIES
)
# Include DLLs with this library on Windows
-if (WIN32 AND EXPAT_FOUND)
+if (false)
install(
FILES
${EXPAT_RUNTIME_LIBRARIES}
diff --git a/plugin/gd/CMakeLists.txt b/plugin/gd/CMakeLists.txt
index fe7ed264d..dce635185 100644
--- a/plugin/gd/CMakeLists.txt
+++ b/plugin/gd/CMakeLists.txt
@@ -36,7 +36,7 @@ install(
)
# Include DLLs with this library on Windows
-if (WIN32)
+if (false)
install(
FILES
${GD_RUNTIME_LIBRARIES}
|
