Apparently for gnat version 5.0, the library is named libgnat-5.so. The
attached patch fixes.
--
Orion Poplawski
Technical Manager 303-415-9701 x222
NWRA, Boulder/CoRA Office FAX: 303-415-9702
3380 Mitchell Lane or...@nwra.com
Boulder, CO 80301 http://www.nwra.com
>From 920dd4b910b6afda0b44df1e6f54437cee38c0b9 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <or...@cora.nwra.com>
Date: Fri, 6 Feb 2015 11:42:57 -0700
Subject: [PATCH] Find libgnat-5
---
cmake/modules/ada.cmake | 7 ++++---
cmake/test_ada/ada.cmake | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/cmake/modules/ada.cmake b/cmake/modules/ada.cmake
index f80f172..88216e9 100644
--- a/cmake/modules/ada.cmake
+++ b/cmake/modules/ada.cmake
@@ -45,10 +45,11 @@ endif(ENABLE_ada)
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})
- set(GNATVERSION ${CMAKE_MATCH_1})
+ string(REGEX MATCH "gcc.* [(][^)]*[)] ([0-9]*)([.][0-9]*)[.][0-9]" ADA_OUTPUT_TRIM ${ADA_OUTPUT})
+ set(GNATMAJVERSION ${CMAKE_MATCH_1})
+ set(GNATVERSION ${CMAKE_MATCH_1}${CMAKE_MATCH_2})
message(STATUS "gnat version = ${GNATVERSION}")
- find_library(GNAT_LIB NAMES gnat gnat-${GNATVERSION})
+ find_library(GNAT_LIB NAMES gnat gnat-${GNATVERSION} gnat-${GNATMAJVERSION})
if(NOT GNAT_LIB)
message(STATUS "WARNING: "
"gnat library not found. Disabling ada bindings")
diff --git a/cmake/test_ada/ada.cmake b/cmake/test_ada/ada.cmake
index b5661cb..96dde9b 100644
--- a/cmake/test_ada/ada.cmake
+++ b/cmake/test_ada/ada.cmake
@@ -6,10 +6,11 @@ endif(NOT CMAKE_Ada_COMPILER_WORKS)
# 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})
-set(GNATVERSION ${CMAKE_MATCH_1})
+string(REGEX MATCH "gcc [(][^)]*[)] ([0-9]*)([.][0-9]*)[.][0-9]" ADA_OUTPUT_TRIM ${ADA_OUTPUT})
+set(GNATMAJVERSION ${CMAKE_MATCH_1})
+set(GNATVERSION ${CMAKE_MATCH_1}${CMAKE_MATCH_2})
message(STATUS "gnat version = ${GNATVERSION}")
-find_library(GNAT_LIB NAMES gnat gnat-${GNATVERSION})
+find_library(GNAT_LIB NAMES gnat gnat-${GNATVERSION} gnat-${GNATMAJVERSION})
if(NOT GNAT_LIB)
message(FATAL_ERROR "Required gnat library not found.")
endif(NOT GNAT_LIB)
--
2.1.0
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Plplot-devel mailing list
Plplot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/plplot-devel
