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
This commit is contained in:
parent
57a7873857
commit
de916f6bfb
|
@ -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()
|
||||
|
|
|
@ -14,7 +14,7 @@ FIND_PROGRAM(HTML_VIEWER_EXECUTABLE
|
|||
mozilla
|
||||
htmlview
|
||||
open
|
||||
ENV{HTML_VIEWER}
|
||||
$ENV{HTML_VIEWER}
|
||||
PATHS
|
||||
${CYGWIN_INSTALL_PATH}/bin
|
||||
/bin
|
||||
|
|
Loading…
Reference in New Issue