From: <ai...@us...> - 2008-08-07 19:50:39
|
Revision: 8610 http://plplot.svn.sourceforge.net/plplot/?rev=8610&view=rev Author: airwin Date: 2008-08-07 19:50:48 +0000 (Thu, 07 Aug 2008) Log Message: ----------- Enable Ada by default. Modified Paths: -------------- trunk/cmake/modules/ada.cmake Modified: trunk/cmake/modules/ada.cmake =================================================================== --- trunk/cmake/modules/ada.cmake 2008-08-07 14:34:45 UTC (rev 8609) +++ trunk/cmake/modules/ada.cmake 2008-08-07 19:50:48 UTC (rev 8610) @@ -22,7 +22,7 @@ if(DEFAULT_NO_BINDINGS) option(ENABLE_ada "Enable Ada bindings" OFF) else(DEFAULT_NO_BINDINGS) - option(ENABLE_ada "Enable Ada bindings" OFF) + option(ENABLE_ada "Enable Ada bindings" ON) endif(DEFAULT_NO_BINDINGS) if(ENABLE_ada) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-02-04 08:33:18
|
Revision: 9448 http://plplot.svn.sourceforge.net/plplot/?rev=9448&view=rev Author: airwin Date: 2009-02-04 08:33:13 +0000 (Wed, 04 Feb 2009) Log Message: ----------- Prepare for gcc 4.4. Modified Paths: -------------- trunk/cmake/modules/ada.cmake Modified: trunk/cmake/modules/ada.cmake =================================================================== --- trunk/cmake/modules/ada.cmake 2009-02-04 08:04:36 UTC (rev 9447) +++ trunk/cmake/modules/ada.cmake 2009-02-04 08:33:13 UTC (rev 9448) @@ -26,7 +26,7 @@ endif(DEFAULT_NO_BINDINGS) if(ENABLE_ada) - find_library(GNAT_LIB NAMES gnat gnat-4.1 gnat-4.2 gnat-4.3) + find_library(GNAT_LIB NAMES gnat gnat-4.1 gnat-4.2 gnat-4.3 gnat-4.4) if(NOT GNAT_LIB) message(STATUS "WARNING: " "gnat library not found. Disabling ada bindings") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-04-03 17:58:47
|
Revision: 10883 http://plplot.svn.sourceforge.net/plplot/?rev=10883&view=rev Author: airwin Date: 2010-04-03 17:58:39 +0000 (Sat, 03 Apr 2010) Log Message: ----------- Look for gnat library with specific versioned names in reverse order so newest is first (after generic gnat name). Add gnat-4.5 (first) in versioned list. gnat-4.5 is used in latest MinGW release and probably in up-to-date Linux distros as well. Modified Paths: -------------- trunk/cmake/modules/ada.cmake Modified: trunk/cmake/modules/ada.cmake =================================================================== --- trunk/cmake/modules/ada.cmake 2010-03-29 15:15:17 UTC (rev 10882) +++ trunk/cmake/modules/ada.cmake 2010-04-03 17:58:39 UTC (rev 10883) @@ -43,7 +43,7 @@ endif(ENABLE_ada) if(ENABLE_ada) - find_library(GNAT_LIB NAMES gnat gnat-4.1 gnat-4.2 gnat-4.3 gnat-4.4) + find_library(GNAT_LIB NAMES gnat gnat-4.5 gnat-4.4 gnat-4.3 gnat-4.2 gnat-4.1) if(NOT GNAT_LIB) message(STATUS "WARNING: " "gnat library not found. Disabling ada bindings") @@ -53,8 +53,6 @@ endif(NOT GNAT_LIB) endif(ENABLE_ada) - - # New stuff by Jerry for source modifications for Ada 2007 or not Ada 2007. option(HAVE_ADA_2007 "Ada 2007?" OFF) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jb...@us...> - 2010-07-22 11:06:39
|
Revision: 11096 http://plplot.svn.sourceforge.net/plplot/?rev=11096&view=rev Author: jbauck Date: 2010-07-22 11:06:33 +0000 (Thu, 22 Jul 2010) Log Message: ----------- Change associated with removing "Ada 2007" stuff from Ada source. Modified Paths: -------------- trunk/cmake/modules/ada.cmake Modified: trunk/cmake/modules/ada.cmake =================================================================== --- trunk/cmake/modules/ada.cmake 2010-07-22 10:58:54 UTC (rev 11095) +++ trunk/cmake/modules/ada.cmake 2010-07-22 11:06:33 UTC (rev 11096) @@ -54,7 +54,7 @@ endif(ENABLE_ada) # New stuff by Jerry for source modifications for Ada 2007 or not Ada 2007. -option(HAVE_ADA_2007 "Ada 2007?" OFF) +set(HAVE_ADA_2007 OFF CACHE BOOL "Ada 2007?" FORCE) if(HAVE_ADA_2007) set(Ada_Is_2007_With_and_Use_Numerics " with Ada.Numerics.Long_Real_Arrays; use Ada.Numerics.Long_Real_Arrays;") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-07-23 05:52:29
|
Revision: 11101 http://plplot.svn.sourceforge.net/plplot/?rev=11101&view=rev Author: airwin Date: 2010-07-23 05:52:23 +0000 (Fri, 23 Jul 2010) Log Message: ----------- Drop everything having to do with HAVE_ADA_2007, Ada_Is_2007_With_and_Use_Numerics, and Ada_Is_Not_2007_Vector_Matrix_Declarations since none of these variables are used elsewhere. Modified Paths: -------------- trunk/cmake/modules/ada.cmake Modified: trunk/cmake/modules/ada.cmake =================================================================== --- trunk/cmake/modules/ada.cmake 2010-07-23 05:32:08 UTC (rev 11100) +++ trunk/cmake/modules/ada.cmake 2010-07-23 05:52:23 UTC (rev 11101) @@ -52,13 +52,3 @@ message(STATUS "FOUND gnat library ${GNAT_LIB}") endif(NOT GNAT_LIB) endif(ENABLE_ada) - -# New stuff by Jerry for source modifications for Ada 2007 or not Ada 2007. -set(HAVE_ADA_2007 OFF CACHE BOOL "Ada 2007?" FORCE) - -if(HAVE_ADA_2007) - set(Ada_Is_2007_With_and_Use_Numerics " with Ada.Numerics.Long_Real_Arrays; use Ada.Numerics.Long_Real_Arrays;") -else(HAVE_ADA_2007) - # Is there some way to put a line ending after the first semicolon in the quoted string? Not essential. - set(Ada_Is_Not_2007_Vector_Matrix_Declarations " type Real_Vector is array (Integer range <>) of Long_Float; type Real_Matrix is array (Integer range <>, Integer range <>) of Long_Float;") -endif(HAVE_ADA_2007) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2012-01-05 11:51:42
|
Revision: 12120 http://plplot.svn.sourceforge.net/plplot/?rev=12120&view=rev Author: andrewross Date: 2012-01-05 11:51:21 +0000 (Thu, 05 Jan 2012) Log Message: ----------- Remove debugging message about gnat version. Modified Paths: -------------- trunk/cmake/modules/ada.cmake Modified: trunk/cmake/modules/ada.cmake =================================================================== --- trunk/cmake/modules/ada.cmake 2012-01-04 23:00:18 UTC (rev 12119) +++ trunk/cmake/modules/ada.cmake 2012-01-05 11:51:21 UTC (rev 12120) @@ -47,8 +47,7 @@ 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}) set(GNATVERSION ${CMAKE_MATCH_1}) - message(STATUS "DEBUG: gnat output ${ADA_OUTPUT}") - message(STATUS "DEBUG: gnat version ${GNATVERSION}") + message(STATUS "gnat version = ${GNATVERSION}") find_library(GNAT_LIB NAMES gnat gnat-${GNATVERSION}) if(NOT GNAT_LIB) message(STATUS "WARNING: " This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
From: <ai...@us...> - 2012-10-27 09:25:05
|
Revision: 12258 http://plplot.svn.sourceforge.net/plplot/?rev=12258&view=rev Author: airwin Date: 2012-10-27 09:24:58 +0000 (Sat, 27 Oct 2012) Log Message: ----------- Change regex for helping to find gnat version to accommodate ".exe" (or not) after "gcc" in string. This change continues to work on Linux, and makes Ada work properly on Wine. Modified Paths: -------------- trunk/cmake/modules/ada.cmake Modified: trunk/cmake/modules/ada.cmake =================================================================== --- trunk/cmake/modules/ada.cmake 2012-10-27 05:34:13 UTC (rev 12257) +++ trunk/cmake/modules/ada.cmake 2012-10-27 09:24:58 UTC (rev 12258) @@ -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 "gcc [(][^)]*[)] ([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. |
From: <and...@us...> - 2013-05-10 20:32:31
|
Revision: 12339 http://sourceforge.net/p/plplot/code/12339 Author: andrewross Date: 2013-05-10 20:32:28 +0000 (Fri, 10 May 2013) Log Message: ----------- Re-enable ada bindings now plshade / pllegend updates have been made. Modified Paths: -------------- trunk/cmake/modules/ada.cmake Modified: trunk/cmake/modules/ada.cmake =================================================================== --- trunk/cmake/modules/ada.cmake 2013-05-10 20:29:46 UTC (rev 12338) +++ trunk/cmake/modules/ada.cmake 2013-05-10 20:32:28 UTC (rev 12339) @@ -22,7 +22,7 @@ if(DEFAULT_NO_BINDINGS) option(ENABLE_ada "Enable Ada bindings" OFF) else(DEFAULT_NO_BINDINGS) - option(ENABLE_ada "Enable Ada bindings" OFF) + option(ENABLE_ada "Enable Ada bindings" ON) endif(DEFAULT_NO_BINDINGS) if(ENABLE_ada AND NOT PLPLOT_Ada_COMPILER_WORKS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2012-01-04 23:00:24
|
Revision: 12119 http://plplot.svn.sourceforge.net/plplot/?rev=12119&view=rev Author: andrewross Date: 2012-01-04 23:00:18 +0000 (Wed, 04 Jan 2012) Log Message: ----------- Test out a method of determining the gnat version from the CMAKE_Ada_COMPILER variable to ensure we look for the right version of libgnat. Modified Paths: -------------- trunk/cmake/modules/ada.cmake Modified: trunk/cmake/modules/ada.cmake =================================================================== --- trunk/cmake/modules/ada.cmake 2012-01-04 19:15:52 UTC (rev 12118) +++ trunk/cmake/modules/ada.cmake 2012-01-04 23:00:18 UTC (rev 12119) @@ -43,7 +43,13 @@ endif(ENABLE_ada) if(ENABLE_ada) - find_library(GNAT_LIB NAMES gnat gnat-4.5 gnat-4.4 gnat-4.3 gnat-4.2 gnat-4.1) + # 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}) + set(GNATVERSION ${CMAKE_MATCH_1}) + message(STATUS "DEBUG: gnat output ${ADA_OUTPUT}") + message(STATUS "DEBUG: gnat version ${GNATVERSION}") + find_library(GNAT_LIB NAMES gnat gnat-${GNATVERSION}) if(NOT GNAT_LIB) message(STATUS "WARNING: " "gnat library not found. Disabling ada bindings") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |