diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-14 16:58:57 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-14 17:00:13 +0000 |
| commit | 2dd8a732f3073c8e90a8c7f1a3de189758aac698 (patch) | |
| tree | 72767e82ef49b9bdcb69dc9b40b458ed5f501903 /cmake | |
| parent | 46496b1a8cbfc1bbc023da253aa05f95d47defd3 (diff) | |
| download | mariadb-git-2dd8a732f3073c8e90a8c7f1a3de189758aac698.tar.gz | |
Windows, compiling - disable pkg_config
pkg_config usually comes with Strawberry perl, and tends to find packages
that might work in mingw compilation, but not with MSVC.
Thus disable PKG_CONFIG, otherwise any FIND_PACKAGE() that is using PkgConfig
can find something (like LibXml2 from connect), can potentially find something
that is not going to compile.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/os/Windows.cmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake index 48184947da5..2dcdecdd72f 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -24,9 +24,6 @@ INCLUDE (CheckCSourceRuns) INCLUDE (CheckSymbolExists) INCLUDE (CheckTypeSize) -# Optionally read user configuration, generated by configure.js. -# This is left for backward compatibility reasons only. -INCLUDE(${CMAKE_BINARY_DIR}/win/configure.data OPTIONAL) # avoid running system checks by using pre-cached check results # system checks are expensive on VS since every tiny program is to be compiled in @@ -63,6 +60,8 @@ IF(MINGW AND CMAKE_SIZEOF_VOID_P EQUAL 4) ENDIF() IF(MSVC) + # Disable mingw based pkg-config found in Strawberry perl + SET(PKG_CONFIG_EXECUTABLE 0 CACHE INTERNAL "") SET(MSVC_CRT_TYPE /MT CACHE STRING "Runtime library - specify runtime library for linking (/MT,/MTd,/MD,/MDd)" ) |