diff options
| author | João Valverde <j@v6e.pt> | 2021-09-22 23:02:03 +0100 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-09-27 16:45:58 +0000 |
| commit | 6c5e56f7528408cc97b76e0b52c2c6a29e05caf8 (patch) | |
| tree | 5ea1e9b68c183516b5601b5804ada86e69fc69f6 /cmake/modules | |
| parent | 1c8752935d9e1fba1efc31eb080edfc5611945d2 (diff) | |
Windows: Add preliminary support for MSYS2
If we are using MSYS2 we use those packages to build Wireshark
using MinGW-w64 and disable most or all of our win-setup.ps1 codepaths.
Fix GLib configuration. Disable copying of DLLs with MSYS2.
Some tests in the suite_capture test suite are failing with MSYS
MINGW64. That particular set of tests is way too brittle regarding
file system paths; more work is needed to improve that situation.
Diffstat (limited to 'cmake/modules')
| -rw-r--r-- | cmake/modules/FindGLIB2.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmake/modules/FindGLIB2.cmake b/cmake/modules/FindGLIB2.cmake index 7b97d339f7..79e8abd29a 100644 --- a/cmake/modules/FindGLIB2.cmake +++ b/cmake/modules/FindGLIB2.cmake @@ -24,7 +24,7 @@ endif() include( FindWSWinLibs ) FindWSWinLibs( "vcpkg-export-*" "GLIB2_HINTS" ) -if (NOT WIN32) +if (NOT USE_REPOSITORY) find_package(PkgConfig) pkg_search_module( PC_GLIB2 glib-2.0 ) endif() @@ -65,7 +65,7 @@ FindWSLibrary( GLIB2_LIBRARY /usr/lib ) -if (WIN32) +if (USE_REPOSITORY) # In the Windows vcpkg port glibconfig.h is in # installed/$ARCH-windows/lib/glib-2.0/include. set( glib2LibDir "${GLIB2_HINTS}/lib" ) @@ -79,6 +79,7 @@ find_path( GLIB2_INTERNAL_INCLUDE_DIR NAMES glibconfig.h HINTS + "${PC_GLIB2_LIBDIR}" "${glib2LibDir}" "${GLIB2_INCLUDEDIR}" ${CMAKE_SYSTEM_LIBRARY_PATH} @@ -121,7 +122,7 @@ if( GLIB2_FOUND ) list(APPEND GLIB2_LIBRARIES -pthread ${PCRE_LIBRARY}) endif() set( GLIB2_INCLUDE_DIRS ${GLIB2_MAIN_INCLUDE_DIR} ${GLIB2_INTERNAL_INCLUDE_DIR} ) - if ( WIN32 AND GLIB2_FOUND ) + if ( USE_REPOSITORY AND GLIB2_FOUND ) set ( GLIB2_DLL_DIR_RELEASE "${GLIB2_HINTS}/bin" CACHE PATH "Path to GLib2 release DLLs" ) |