On 10/31/2015 11:10 AM, Alan W. Irwin wrote:
Hi Orion:
Thanks for implementing Brad's suggestion to fix the PLplot Ada
language support issue for CMake-3.4. To help give you PLplot git
credit for your work, would you please put the patch in "git
format-patch" form?
Attached.
I also notice substantial use of <FLAGS> in the PLplot D language
support case. I assume your tests did not reveal any issues for D
because you were not trying any D compiler flags, but I predict if you
do that, you will encounter the same problem. For example, if you try
export DFLAGS=-Iwhatever
I assume that (harmless) compile flag will correctly propagate to the D
compile step (as seen
by the VERBOSE=1 option for make) for older versions of CMake but will
not propagate correctly for CMake-3.4.
Anyhow, I am virtually positive there is also a PLplot <FLAGS> D
language support issue for CMake-3.4 so if you don't beat me to it, I
plan (likely late next week because I am currently tied up with
something else) to expose that issue with a test like the one I
suggested above and also plan to fix the issue following Brad's
suggestion.
I don't enable D support on the Fedora package, so I haven't looked at this.
--
Orion Poplawski
Technical Manager 303-415-9701 x222
NWRA/CoRA Division FAX: 303-415-9702
3380 Mitchell Lane or...@cora.nwra.com
Boulder, CO 80301 http://www.cora.nwra.com
>From f72545a21c2aeb206a4e06d9329eb6019a22ea99 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <or...@cora.nwra.com>
Date: Sun, 1 Nov 2015 19:51:48 -0700
Subject: [PATCH] Add support for cmake 3.4 for Ada
---
cmake/modules/language_support/cmake/CMakeAdaInformation.cmake | 10 +++++++---
.../cmake_experimental/Modules/CMakeAdaInformation.cmake | 10 +++++++---
cmake/test_ada/cmake_working/Modules/CMakeAdaInformation.cmake | 10 +++++++---
3 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/cmake/modules/language_support/cmake/CMakeAdaInformation.cmake b/cmake/modules/language_support/cmake/CMakeAdaInformation.cmake
index 4d9a78a..3f0e6a4 100644
--- a/cmake/modules/language_support/cmake/CMakeAdaInformation.cmake
+++ b/cmake/modules/language_support/cmake/CMakeAdaInformation.cmake
@@ -176,9 +176,13 @@ ENDIF(NOT CMAKE_Ada_CREATE_STATIC_LIBRARY)
# compile a Ada file into an object file
IF(NOT CMAKE_Ada_COMPILE_OBJECT)
- SET(CMAKE_Ada_COMPILE_OBJECT
- "<CMAKE_Ada_COMPILER> <FLAGS> -c <SOURCE> -o <OBJECT>
- ")
+ IF(NOT CMAKE_VERSION VERSION_LESS 3.4)
+ SET(CMAKE_Ada_COMPILE_OBJECT
+ "<CMAKE_Ada_COMPILER> <INCLUDES> <FLAGS> -c <SOURCE> -o <OBJECT>")
+ ELSE()
+ SET(CMAKE_Ada_COMPILE_OBJECT
+ "<CMAKE_Ada_COMPILER> <FLAGS> -c <SOURCE> -o <OBJECT>")
+ ENDIF()
ENDIF(NOT CMAKE_Ada_COMPILE_OBJECT)
# Constraints: GNAT_EXECUTABLE_BUILDER = gnatmake
diff --git a/cmake/test_ada/cmake_experimental/Modules/CMakeAdaInformation.cmake b/cmake/test_ada/cmake_experimental/Modules/CMakeAdaInformation.cmake
index 03d4db7..a0fcb40 100644
--- a/cmake/test_ada/cmake_experimental/Modules/CMakeAdaInformation.cmake
+++ b/cmake/test_ada/cmake_experimental/Modules/CMakeAdaInformation.cmake
@@ -147,9 +147,13 @@ ENDIF(NOT CMAKE_Ada_CREATE_STATIC_LIBRARY)
# compile a Ada file into an object file
IF(NOT CMAKE_Ada_COMPILE_OBJECT)
- SET(CMAKE_Ada_COMPILE_OBJECT
- "<CMAKE_Ada_COMPILER> <FLAGS> -c <SOURCE> -o <OBJECT>
- ")
+ IF(NOT CMAKE_VERSION VERSION_LESS 3.4)
+ SET(CMAKE_Ada_COMPILE_OBJECT
+ "<CMAKE_Ada_COMPILER> <INCLUDES> <FLAGS> -c <SOURCE> -o <OBJECT>")
+ ELSE()
+ SET(CMAKE_Ada_COMPILE_OBJECT
+ "<CMAKE_Ada_COMPILER> <FLAGS> -c <SOURCE> -o <OBJECT>")
+ ENDIF()
ENDIF(NOT CMAKE_Ada_COMPILE_OBJECT)
# Constraints: GNAT_EXECUTABLE_BUILDER = gnatmake
diff --git a/cmake/test_ada/cmake_working/Modules/CMakeAdaInformation.cmake b/cmake/test_ada/cmake_working/Modules/CMakeAdaInformation.cmake
index 4d9a78a..3f0e6a4 100644
--- a/cmake/test_ada/cmake_working/Modules/CMakeAdaInformation.cmake
+++ b/cmake/test_ada/cmake_working/Modules/CMakeAdaInformation.cmake
@@ -176,9 +176,13 @@ ENDIF(NOT CMAKE_Ada_CREATE_STATIC_LIBRARY)
# compile a Ada file into an object file
IF(NOT CMAKE_Ada_COMPILE_OBJECT)
- SET(CMAKE_Ada_COMPILE_OBJECT
- "<CMAKE_Ada_COMPILER> <FLAGS> -c <SOURCE> -o <OBJECT>
- ")
+ IF(NOT CMAKE_VERSION VERSION_LESS 3.4)
+ SET(CMAKE_Ada_COMPILE_OBJECT
+ "<CMAKE_Ada_COMPILER> <INCLUDES> <FLAGS> -c <SOURCE> -o <OBJECT>")
+ ELSE()
+ SET(CMAKE_Ada_COMPILE_OBJECT
+ "<CMAKE_Ada_COMPILER> <FLAGS> -c <SOURCE> -o <OBJECT>")
+ ENDIF()
ENDIF(NOT CMAKE_Ada_COMPILE_OBJECT)
# Constraints: GNAT_EXECUTABLE_BUILDER = gnatmake
--
2.4.3
------------------------------------------------------------------------------
_______________________________________________
Plplot-devel mailing list
Plplot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/plplot-devel
