diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-08-25 10:20:59 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2017-08-25 18:49:09 +0000 |
| commit | 9ae80aea082384605e647f55fbc4d2910811a929 (patch) | |
| tree | 70f9acc9b19a0a99d19accb829bcab7cbaec7027 /CMakeLists.txt | |
| parent | 659b95765cd0fd213ba301c2162ec525422f8ff3 (diff) | |
CMake: Package list updates.
Move gcrypt to the required package section. Fold the various
xxx_REQUIRED variables into xxx_OPTIONS.
Change-Id: Ib4220d7344e2bbac9062465d175921733bb0fe52
Reviewed-on: https://code.wireshark.org/review/23208
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 986ebe587b..547cf21954 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -822,26 +822,27 @@ if(APPLE AND EXISTS /usr/local/opt/gettext) link_directories(/usr/local/opt/gettext/lib) endif() -# The packagelist is doing some magic: If we add XXX to the packagelist, we +# The packagelist is doing some magic: If we add XXX to the packagelist, we # - may optionally set XXX_OPTIONS to pass to the find_package command -# - will call FindXXX.cmake +# - will call FindXXX.cmake or find_package # - return found libraries in XXX_LIBRARIES # - return found include in XXX_INCLUDE_DIRS # - set HAVE_XXX -#The minimum package list -set(PACKAGELIST Gettext M Git GLIB2 GMODULE2 GTHREAD2 LEX YACC Perl SH PythonInterp NGHTTP2) -set(LEX_REQUIRED TRUE) -set(GLIB2_REQUIRED TRUE) -set(GLIB2_FIND_REQUIRED TRUE) +# The minimum package list +set(PACKAGELIST Gettext M Git GLIB2 GMODULE2 GTHREAD2 GCRYPT LEX YACC Perl SH PythonInterp NGHTTP2) +set(LEX_OPTIONS REQUIRED) +set(GLIB2_OPTIONS REQUIRED) +set(GLIB2_FIND_OPTIONS REQUIRED) set(GLIB2_MIN_VERSION 2.22.0) -set(GTHREAD2_REQUIRED TRUE) +set(GTHREAD2_OPTIONS REQUIRED) +set(GCRYPT_OPTIONS "1.4.2" REQUIRED) set(PythonInterp_FIND_VERSION 2) set(Python_ADDITIONAL_VERSIONS 3) -set(YACC_REQUIRED TRUE) +set(YACC_OPTIONS REQUIRED) if (NOT WIN32) - set(M_REQUIRED TRUE) + set(M_OPTIONS REQUIRED) endif() set(PACKAGELIST ${PACKAGELIST} LIBSSH) @@ -903,11 +904,6 @@ if(ENABLE_SMI) set(PACKAGELIST ${PACKAGELIST} SMI) endif() -# GNU crypto -set(PACKAGELIST ${PACKAGELIST} GCRYPT) -# Minimum version needed. -set(GCRYPT_OPTIONS "1.4.2" REQUIRED) - # GNU SSL/TLS support if(ENABLE_GNUTLS) set(PACKAGELIST ${PACKAGELIST} GNUTLS) @@ -1031,8 +1027,6 @@ foreach(PACKAGE ${PACKAGELIST}) endif() if(${PACKAGE}_OPTIONS) find_package(${PACKAGE} ${${PACKAGE}_OPTIONS}) - elseif(${PACKAGE}_REQUIRED) - find_package(${PACKAGE} REQUIRED) else() find_package(${PACKAGE}) endif() @@ -1063,7 +1057,7 @@ foreach(PACKAGE ${PACKAGELIST}) # # Not finding a package is only a fatal error if the # package is required; if it's required, then its - # XXX_REQUIRED variable is set to TRUE, and the above + # XXX_OPTIONS variable contains REQUIRED, and the above # code will pass REQUIRED to find_package, and the # configure will fail if the package isn't found. # |