osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

CMake: Clean up Windows build 

Remove options that aren't supported on Windows
Don't use pkgconfig on Windows

Change-Id: I79718a1c43f56a9ec88f690490931b80b727dd68
Reviewed-on: https://code.wireshark.org/review/24481
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Graham Bloice 2017-11-18 20:16:32 +00:00 committed by Michael Mann
parent adc1aff0a5
commit bab9abfb7d
14 changed files with 70 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -826,7 +826,7 @@ endif()
# - set HAVE_XXX
# The minimum package list
set(PACKAGELIST Gettext M Git GLIB2 GMODULE2 GTHREAD2 GCRYPT LEX YACC Perl SH PythonInterp)
set(PACKAGELIST Git GLIB2 GMODULE2 GTHREAD2 GCRYPT LEX YACC Perl SH PythonInterp)
set(LEX_OPTIONS REQUIRED)
set(GLIB2_OPTIONS REQUIRED)
set(GLIB2_FIND_OPTIONS REQUIRED)
@ -838,6 +838,7 @@ set(Python_ADDITIONAL_VERSIONS 3)
set(YACC_OPTIONS REQUIRED)
if (NOT WIN32)
set(PACKAGELIST ${PACKAGELIST} Gettext M)
set(M_OPTIONS REQUIRED)
endif()

4
CMakeOptions.txt
View File

@ -77,7 +77,9 @@ option(ENABLE_GEOIP "Build with GeoIP support" ON)
if(WIN32)
option(ENABLE_WINSPARKLE "Enable WinSparkle support" ON)
endif()
option(ENABLE_CAP "Build with Posix capabilities support" ON)
if (NOT WIN32)
option(ENABLE_CAP "Build with Posix capabilities support" ON)
endif()
option(ENABLE_CARES "Build with c-ares support" ON)
if(UNIX)
# Libnl is Linux-specific.

6
cmake/modules/FindBCG729.cmake
View File

@ -9,8 +9,10 @@
include( FindWSWinLibs )
FindWSWinLibs( "bcg729-.*" "BCG729_HINTS" )
find_package(PkgConfig)
pkg_search_module(BCG729 bcg729)
if (NOT WIN32)
find_package(PkgConfig)
pkg_search_module(BCG729 bcg729)
endif()
find_path( BCG729_INCLUDE_DIR
NAMES bcg729/decoder.h

6
cmake/modules/FindGEOIP.cmake
View File

@ -17,8 +17,10 @@ ENDIF (GEOIP_INCLUDE_DIRS)
INCLUDE(FindWSWinLibs)
FindWSWinLibs("GeoIP-.*" "GEOIP_HINTS")
find_package(PkgConfig)
pkg_search_module(GEOIP geoip)
IF (NOT WIN32)
find_package(PkgConfig)
pkg_search_module(GEOIP geoip)
endif()
FIND_PATH(GEOIP_INCLUDE_DIR GeoIP.h
HINTS

13
cmake/modules/FindGLIB2.cmake
View File

@ -27,12 +27,15 @@ else()
FindWSWinLibs( "gtk2" "GLIB2_HINTS" )
endif()
find_package( PkgConfig )
if (NOT WIN32)
find_package(PkgConfig)
pkg_search_module(GEOIP geoip)
if( GLIB2_MIN_VERSION )
pkg_search_module( GLIB2 glib-2.0>=${GLIB2_MIN_VERSION} )
else()
pkg_search_module( GLIB2 glib-2.0 )
if( GLIB2_MIN_VERSION )
pkg_search_module( GLIB2 glib-2.0>=${GLIB2_MIN_VERSION} )
else()
pkg_search_module( GLIB2 glib-2.0 )
endif()
endif()
find_path( GLIB2_MAIN_INCLUDE_DIR

22
cmake/modules/FindGMODULE2.cmake
View File

@ -13,18 +13,20 @@
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
include( FindPkgConfig )
if( NOT WIN32 )
include( FindPkgConfig )
if( GMODULE2_FIND_REQUIRED )
set( _pkgconfig_REQUIRED "REQUIRED" )
else()
set( _pkgconfig_REQUIRED "" )
endif()
if( GMODULE2_FIND_REQUIRED )
set( _pkgconfig_REQUIRED "REQUIRED" )
else()
set( _pkgconfig_REQUIRED "" )
endif()
if( GMODULE2_MIN_VERSION )
pkg_search_module( GMODULE2 ${_pkgconfig_REQUIRED} gmodule-2.0>=${GMODULE2_MIN_VERSION} )
else()
pkg_search_module( GMODULE2 ${_pkgconfig_REQUIRED} gmodule-2.0 )
if( GMODULE2_MIN_VERSION )
pkg_search_module( GMODULE2 ${_pkgconfig_REQUIRED} gmodule-2.0>=${GMODULE2_MIN_VERSION} )
else()
pkg_search_module( GMODULE2 ${_pkgconfig_REQUIRED} gmodule-2.0 )
endif()
endif()
if( GMODULE2_FOUND )

6
cmake/modules/FindGNUTLS.cmake
View File

@ -17,8 +17,10 @@ ENDIF (GNUTLS_INCLUDE_DIRS)
INCLUDE(FindWSWinLibs)
FindWSWinLibs("gnutls-.*" "GNUTLS_HINTS")
find_package(PkgConfig)
pkg_search_module(GNUTLS gnutls)
if (NOT WIN32)
find_package(PkgConfig)
pkg_search_module(GNUTLS gnutls)
endif()
# sources include gnutls/gnutls.h, look for that location instead of gnutls.h.
FIND_PATH(GNUTLS_INCLUDE_DIR

12
cmake/modules/FindGTHREAD2.cmake
View File

@ -13,12 +13,14 @@
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
include( FindPkgConfig )
if( NOT WIN32 )
include( FindPkgConfig )
if( GTHREAD2_MIN_VERSION )
PKG_SEARCH_MODULE( GTHREAD2 gthread-2.0>=${GTHREAD2_MIN_VERSION} )
else()
PKG_SEARCH_MODULE( GTHREAD2 gthread-2.0 )
if( GTHREAD2_MIN_VERSION )
PKG_SEARCH_MODULE( GTHREAD2 gthread-2.0>=${GTHREAD2_MIN_VERSION} )
else()
PKG_SEARCH_MODULE( GTHREAD2 gthread-2.0 )
endif()
endif()
if( GTHREAD2_FOUND )

6
cmake/modules/FindKERBEROS.cmake
View File

@ -19,8 +19,10 @@ endif()
include(FindWSWinLibs)
FindWSWinLibs("kfw-.*" "KERBEROS_HINTS")
find_package(PkgConfig)
pkg_search_module(KERBEROS krb5 mit-krb5 heimdal-krb5)
if(NOT WIN32)
find_package(PkgConfig)
pkg_search_module(KERBEROS krb5 mit-krb5 heimdal-krb5)
endif()
if(NOT KERBEROS_FOUND)
# Fallback detection if pkg-config files are not installed.

10
cmake/modules/FindLUA.cmake
View File

@ -17,10 +17,12 @@
INCLUDE(FindWSWinLibs)
FindWSWinLibs("lua5*" "LUA_HINTS")
find_package(PkgConfig)
pkg_search_module(LUA lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua5.0 lua-5.0 lua50)
if(NOT LUA_FOUND)
pkg_search_module(LUA "lua<=5.2.99")
if(NOT WIN32)
find_package(PkgConfig)
pkg_search_module(LUA lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua5.0 lua-5.0 lua50)
if(NOT LUA_FOUND)
pkg_search_module(LUA "lua<=5.2.99")
endif()
endif()
FIND_PATH(LUA_INCLUDE_DIR lua.h

6
cmake/modules/FindLZ4.cmake
View File

@ -11,8 +11,10 @@
include( FindWSWinLibs )
FindWSWinLibs( "lz4-.*" "LZ4_HINTS" )
find_package(PkgConfig)
pkg_search_module(LZ4 lz4 liblz4)
if( NOT WIN32)
find_package(PkgConfig)
pkg_search_module(LZ4 lz4 liblz4)
endif()
find_path(LZ4_INCLUDE_DIR
NAMES lz4.h

6
cmake/modules/FindNGHTTP2.cmake
View File

@ -9,8 +9,10 @@
include( FindWSWinLibs )
FindWSWinLibs( "nghttp2-.*" "NGHTTP2_HINTS" )
find_package(PkgConfig)
pkg_search_module(NGHTTP2 libnghttp2)
if( NOT WIN32)
find_package(PkgConfig)
pkg_search_module(NGHTTP2 libnghttp2)
endif()
find_path( NGHTTP2_INCLUDE_DIR
NAMES nghttp2/nghttp2.h

6
cmake/modules/FindSNAPPY.cmake
View File

@ -11,8 +11,10 @@
include( FindWSWinLibs )
FindWSWinLibs( "snappy-.*" "SNAPPY_HINTS" )
find_package(PkgConfig)
pkg_search_module(SNAPPY libsnappy)
if( NOT WIN32)
find_package(PkgConfig)
pkg_search_module(SNAPPY libsnappy)
endif()
find_path(SNAPPY_INCLUDE_DIR
NAMES snappy.h

6
cmake/modules/FindSPANDSP.cmake
View File

@ -9,8 +9,10 @@
include( FindWSWinLibs )
FindWSWinLibs( "spandsp-.*" "SPANDSP_HINTS" )
find_package(PkgConfig)
pkg_search_module(SPANDSP spandsp)
if( NOT WIN32)
find_package(PkgConfig)
pkg_search_module(SPANDSP spandsp)
endif()
find_path( SPANDSP_INCLUDE_DIR
NAMES spandsp.h