diff options
| author | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-09-28 19:23:15 +0000 |
|---|---|---|
| committer | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-09-28 19:23:15 +0000 |
| commit | 42c56485dcfb49d116c06dec8be8b28088a7f4a2 (patch) | |
| tree | 689ea3436cf43652107cc8368407fb93271db52e /CMakeLists.txt | |
| parent | 827de6ab6001a89938050fa534775855e945ff98 (diff) | |
- Reset a few more variables used in FindXYZ scripts.
- README.cmake: small update.
- Set a variable before using it for installation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34274 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index db8b5004e6..ace54185ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -223,6 +223,9 @@ endif() #The minimum package list set(PACKAGELIST GLIB2 GMODULE2 PCAP M LEX YACC Perl SH PythonInterp HtmlViewer ${PACKAGELIST}) +set(GLIB2_FIND_REQUIRED) +set(GLIB2_MIN_VERSION 2.4.0) + #Build the gui ? if(BUILD_wireshark) set(PACKAGELIST GTK2 ${PACKAGELIST}) @@ -397,6 +400,10 @@ add_subdirectory( tools/lemon ) add_subdirectory( wiretap ) add_subdirectory( wsutil ) +# Basedir where to install guides +set(DOC_DIR "$ENV{docdir}") +message(STATUS "docdir: ${DOC_DIR}") + if(ENABLE_GUIDES) add_subdirectory( docbook ) endif() @@ -427,10 +434,6 @@ endif() configure_file(${CMAKE_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_BINARY_DIR}/config.h) -# Basedir where to install guides -set(DOC_DIR "$ENV{docdir}") -message(STATUS "docdir: ${DOC_DIR}") - include(FeatureSummary) #SET_FEATURE_INFO(NAME DESCRIPTION [URL [COMMENT] ] PRINT_ENABLED_FEATURES() |