From: <and...@us...> - 2012-04-11 11:24:54
|
Revision: 12189 http://plplot.svn.sourceforge.net/plplot/?rev=12189&view=rev Author: andrewross Date: 2012-04-11 11:24:48 +0000 (Wed, 11 Apr 2012) Log Message: ----------- Minor tweak to ada logic for cases where the Ada compiler is gcc not gnatgcc. Modified Paths: -------------- trunk/cmake/modules/ada.cmake Modified: trunk/cmake/modules/ada.cmake =================================================================== --- trunk/cmake/modules/ada.cmake 2012-04-11 08:41:56 UTC (rev 12188) +++ trunk/cmake/modules/ada.cmake 2012-04-11 11:24:48 UTC (rev 12189) @@ -45,7 +45,7 @@ if(ENABLE_ada) # Find the gnat version used in order to search for the right version of libgnat execute_process(COMMAND ${CMAKE_Ada_COMPILER} --version OUTPUT_VARIABLE ADA_OUTPUT) - string(REGEX MATCH "gnatgcc [(][^)]*[)] ([0-9]*[.][0-9]*)[.][0-9]" ADA_OUTPUT_TRIM ${ADA_OUTPUT}) + string(REGEX MATCH "gcc [(][^)]*[)] ([0-9]*[.][0-9]*)[.][0-9]" ADA_OUTPUT_TRIM ${ADA_OUTPUT}) set(GNATVERSION ${CMAKE_MATCH_1}) message(STATUS "gnat version = ${GNATVERSION}") find_library(GNAT_LIB NAMES gnat gnat-${GNATVERSION}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |