Slightly rework the detection code for some packages.

Make compile flag detection work (needed some not so nice hacks).


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30129 f5534014-38df-0310-8fa8-9805f1628bb7

4 files changed, 11 insertions, 43 deletions

diff --git a/cmake/modules/FindHtmlViewer.cmake b/cmake/modules/FindHtmlViewer.cmake
index 40cd03d4b2..7f4f18473b 100644
--- a/cmake/modules/FindHtmlViewer.cmake
+++ b/cmake/modules/FindHtmlViewer.cmake
@@ -22,13 +22,8 @@ FIND_PROGRAM(HTML_VIEWER_EXECUTABLE
     /sbin
 )
 
-IF (NOT HTML_VIEWER_EXECUTABLE)
-  MESSAGE(FATAL_ERROR "HTML_VIEWER not found - aborting")
-ELSE ()
-  SET (HTML_VIEWER_FOUND "YES")
-  MESSAGE(STATUS "Found HTML_VIEWER: ${HTML_VIEWER_EXECUTABLE}")
-ENDIF ()
-
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(HtmlViewer DEFAULT_MSG HTML_VIEWER_EXECUTABLE)
 
 # For compat with configure
 SET(HTML_VIEWER ${HTML_VIEWER_EXECUTABLE})
diff --git a/cmake/modules/FindLEX.cmake b/cmake/modules/FindLEX.cmake
index f84c8967de..b38411f7dd 100644
--- a/cmake/modules/FindLEX.cmake
+++ b/cmake/modules/FindLEX.cmake
@@ -18,23 +18,14 @@ FIND_PROGRAM(LEX_EXECUTABLE
     /sbin
 )
 
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LEX DEFAULT_MSG LEX_EXECUTABLE)
+
 MARK_AS_ADVANCED(LEX_EXECUTABLE)
 
 # flex a .l file
 
-# search flex
-MACRO(FIND_LEX)
-  IF(NOT LEX_EXECUTABLE)
-    FIND_PROGRAM(LEX_EXECUTABLE flex)
-    IF (NOT LEX_EXECUTABLE)
-      MESSAGE(FATAL_ERROR "flex not found - aborting")
-    ENDIF (NOT LEX_EXECUTABLE)
-  ENDIF(NOT LEX_EXECUTABLE)
-ENDMACRO(FIND_LEX)
-
 MACRO(ADD_LEX_FILES _sources )
-  FIND_LEX()
-
     FOREACH (_current_FILE ${ARGN})
       GET_FILENAME_COMPONENT(_in ${_current_FILE} ABSOLUTE)
       GET_FILENAME_COMPONENT(_basename ${_current_FILE} NAME_WE)
@@ -51,7 +42,6 @@ MACRO(ADD_LEX_FILES _sources )
           ${_in}
         DEPENDS ${_in}
       )
-
     SET(${_sources} ${${_sources}} ${_outc} )
   ENDFOREACH (_current_FILE)
 ENDMACRO(ADD_LEX_FILES)
diff --git a/cmake/modules/FindSH.cmake b/cmake/modules/FindSH.cmake
index 394336e20e..ebfda9b9e4 100644
--- a/cmake/modules/FindSH.cmake
+++ b/cmake/modules/FindSH.cmake
@@ -18,15 +18,8 @@ FIND_PROGRAM(SH_EXECUTABLE
     /sbin
 )
 
-MARK_AS_ADVANCED(SH_EXECUTABLE)
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SH DEFAULT_MSG SH_EXECUTABLE)
 
-# search sh
-MACRO(FIND_SH)
-    IF(NOT SH_EXECUTABLE)
-        FIND_PROGRAM(SH_EXECUTABLE sh)
-        IF (NOT SH_EXECUTABLE)
-          MESSAGE(FATAL_ERROR "sh not found - aborting")
-        ENDIF (NOT SH_EXECUTABLE)
-    ENDIF(NOT SH_EXECUTABLE)
-ENDMACRO(FIND_SH)
+MARK_AS_ADVANCED(SH_EXECUTABLE)
 
diff --git a/cmake/modules/FindYACC.cmake b/cmake/modules/FindYACC.cmake
index 9972136879..f71650b036 100644
--- a/cmake/modules/FindYACC.cmake
+++ b/cmake/modules/FindYACC.cmake
@@ -19,21 +19,12 @@ FIND_PROGRAM(YACC_EXECUTABLE
     /sbin
 )
 
-MARK_AS_ADVANCED(YACC_EXECUTABLE)
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(YACC DEFAULT_MSG YACC_EXECUTABLE)
 
-# search bison/yacc
-MACRO(FIND_YACC)
-    IF(NOT YACC_EXECUTABLE)
-        FIND_PROGRAM(YACC_EXECUTABLE bison)
-        IF (NOT YACC_EXECUTABLE)
-          MESSAGE(FATAL_ERROR "bison/yacc not found - aborting")
-        ENDIF (NOT YACC_EXECUTABLE)
-    ENDIF(NOT YACC_EXECUTABLE)
-ENDMACRO(FIND_YACC)
+MARK_AS_ADVANCED(YACC_EXECUTABLE)
 
 MACRO(ADD_YACC_FILES _sources )
-    FIND_YACC()
-
     FOREACH (_current_FILE ${ARGN})
       GET_FILENAME_COMPONENT(_in ${_current_FILE} ABSOLUTE)
       GET_FILENAME_COMPONENT(_basename ${_current_FILE} NAME_WE)
@@ -49,7 +40,6 @@ MACRO(ADD_YACC_FILES _sources )
            ${_in}
          DEPENDS ${_in}
       )
-
       SET(${_sources} ${${_sources}} ${_out} )
    ENDFOREACH (_current_FILE)
 ENDMACRO(ADD_YACC_FILES)