diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2010-09-23 06:59:41 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2010-09-23 06:59:41 +0000 |
| commit | de916f6bfbc4fb6b30c7da39cb68941ea4e4ee67 (patch) | |
| tree | 76d41990f743de9c42bc73ba11a7d8255d864433 | |
| parent | 57a7873857dca94a8021c258f30ac84200a3550b (diff) | |
| download | wireshark-de916f6bfbc4fb6b30c7da39cb68941ea4e4ee67.tar.gz | |
Try to add support to learn the HTML_VIEWER variable and the DOC_DIR variables from the environment - not yet working
svn path=/trunk/; revision=34200
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | cmake/modules/FindHtmlViewer.cmake | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f13eaf843..10cc896414 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,11 @@ project(Wireshark C) cmake_minimum_required(VERSION 2.6) set(CMAKE_BACKWARDS_COMPATIBILITY 2.6) +# Needs to be set after cmake_minimum_required or cmake_policy(VERSION) +#if(COMMAND cmake_policy) +# cmake_policy(SET CMP0015 NEW) +#endif(COMMAND cmake_policy) + # set(PROJECT_VERSION "1.3.4-rc5") # set(PROJECT_VERSION "1.3.4rc5") # set(PROJECT_VERSION "1.3.4") @@ -423,6 +428,10 @@ 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() diff --git a/cmake/modules/FindHtmlViewer.cmake b/cmake/modules/FindHtmlViewer.cmake index 36d8cf5d58..d96d49ecbf 100644 --- a/cmake/modules/FindHtmlViewer.cmake +++ b/cmake/modules/FindHtmlViewer.cmake @@ -14,7 +14,7 @@ FIND_PROGRAM(HTML_VIEWER_EXECUTABLE mozilla htmlview open - ENV{HTML_VIEWER} + $ENV{HTML_VIEWER} PATHS ${CYGWIN_INSTALL_PATH}/bin /bin |