diff options
Diffstat (limited to 'Modules/FindGnuplot.cmake')
| -rw-r--r-- | Modules/FindGnuplot.cmake | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Modules/FindGnuplot.cmake b/Modules/FindGnuplot.cmake index b8dc3f49a..07af0bf20 100644 --- a/Modules/FindGnuplot.cmake +++ b/Modules/FindGnuplot.cmake @@ -21,10 +21,10 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) -INCLUDE(FindCygwin) +include(FindCygwin) -FIND_PROGRAM(GNUPLOT_EXECUTABLE - NAMES +find_program(GNUPLOT_EXECUTABLE + NAMES gnuplot pgnuplot wgnupl32 @@ -32,26 +32,26 @@ FIND_PROGRAM(GNUPLOT_EXECUTABLE ${CYGWIN_INSTALL_PATH}/bin ) -IF (GNUPLOT_EXECUTABLE) - EXECUTE_PROCESS(COMMAND "${GNUPLOT_EXECUTABLE}" --version +if (GNUPLOT_EXECUTABLE) + execute_process(COMMAND "${GNUPLOT_EXECUTABLE}" --version OUTPUT_VARIABLE GNUPLOT_OUTPUT_VARIABLE ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) - STRING(REGEX REPLACE "^gnuplot ([0-9\\.]+)( patchlevel )?" "\\1." GNUPLOT_VERSION_STRING "${GNUPLOT_OUTPUT_VARIABLE}") - STRING(REGEX REPLACE "\\.$" "" GNUPLOT_VERSION_STRING "${GNUPLOT_VERSION_STRING}") - UNSET(GNUPLOT_OUTPUT_VARIABLE) -ENDIF() + string(REGEX REPLACE "^gnuplot ([0-9\\.]+)( patchlevel )?" "\\1." GNUPLOT_VERSION_STRING "${GNUPLOT_OUTPUT_VARIABLE}") + string(REGEX REPLACE "\\.$" "" GNUPLOT_VERSION_STRING "${GNUPLOT_VERSION_STRING}") + unset(GNUPLOT_OUTPUT_VARIABLE) +endif() # for compatibility -SET(GNUPLOT ${GNUPLOT_EXECUTABLE}) +set(GNUPLOT ${GNUPLOT_EXECUTABLE}) -# handle the QUIETLY and REQUIRED arguments and set GNUPLOT_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set GNUPLOT_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Gnuplot REQUIRED_VARS GNUPLOT_EXECUTABLE VERSION_VAR GNUPLOT_VERSION_STRING) -MARK_AS_ADVANCED( GNUPLOT_EXECUTABLE ) +mark_as_advanced( GNUPLOT_EXECUTABLE ) |