kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use FPHSA() in FindSWIG, including version checking. 

Alex
This commit is contained in:
Alex Neundorf 2010-08-07 23:18:17 +02:00
parent 656cd2fad2
commit b6c61561d6
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Modules/FindSWIG.cmake
View File

@ -5,6 +5,9 @@
# SWIG_EXECUTABLE - the path to the swig executable # SWIG_EXECUTABLE - the path to the swig executable
# SWIG_VERSION - the version number of the swig executable # SWIG_VERSION - the version number of the swig executable
# #
# The minimum required version of SWIG can be specified using the
# standard syntax, e.g. FIND_PACKAGE(SWIG 1.1)
#
# All information is collected from the SWIG_EXECUTABLE so the # All information is collected from the SWIG_EXECUTABLE so the
# version to be found can be changed from the command line by # version to be found can be changed from the command line by
# means of setting SWIG_EXECUTABLE # means of setting SWIG_EXECUTABLE
@ -23,8 +26,6 @@
# (To distributed this file outside of CMake, substitute the full # (To distributed this file outside of CMake, substitute the full
# License text for the above reference.) # License text for the above reference.)
SET(SWIG_FOUND FALSE)
FIND_PROGRAM(SWIG_EXECUTABLE swig) FIND_PROGRAM(SWIG_EXECUTABLE swig)
IF(SWIG_EXECUTABLE) IF(SWIG_EXECUTABLE)
@ -45,7 +46,6 @@ IF(SWIG_EXECUTABLE)
SET(SWIG_DIR SWIG_DIR-NOTFOUND) SET(SWIG_DIR SWIG_DIR-NOTFOUND)
FIND_PATH(SWIG_DIR swig.swg PATHS ${SWIG_swiglib_output}) FIND_PATH(SWIG_DIR swig.swg PATHS ${SWIG_swiglib_output})
IF(SWIG_DIR) IF(SWIG_DIR)
SET(SWIG_FOUND 1)
SET(SWIG_USE_FILE ${CMAKE_ROOT}/Modules/UseSWIG.cmake) SET(SWIG_USE_FILE ${CMAKE_ROOT}/Modules/UseSWIG.cmake)
EXECUTE_PROCESS(COMMAND ${SWIG_EXECUTABLE} -version EXECUTE_PROCESS(COMMAND ${SWIG_EXECUTABLE} -version
OUTPUT_VARIABLE SWIG_version_output OUTPUT_VARIABLE SWIG_version_output
@ -62,12 +62,6 @@ IF(SWIG_EXECUTABLE)
ENDIF(SWIG_swiglib_result) ENDIF(SWIG_swiglib_result)
ENDIF(SWIG_EXECUTABLE) ENDIF(SWIG_EXECUTABLE)
IF(NOT SWIG_FOUND) INCLUDE(FindPackageHandleStandardArgs)
IF(NOT SWIG_FIND_QUIETLY) FIND_PACKAGE_HANDLE_STANDARD_ARGS(SWIG REQUIRED_VARS SWIG_EXECUTABLE SWIG_DIR
IF(SWIG_FIND_REQUIRED) VERSION_VAR SWIG_VERSION )
MESSAGE(FATAL_ERROR "SWIG was not found. Please specify Swig executable location")
ELSE(SWIG_FIND_REQUIRED)
MESSAGE(STATUS "SWIG was not found. Please specify Swig executable location")
ENDIF(SWIG_FIND_REQUIRED)
ENDIF(NOT SWIG_FIND_QUIETLY)
ENDIF(NOT SWIG_FOUND)