|
From: <ai...@us...> - 2014-01-22 09:03:09
|
Revision: 12947
http://sourceforge.net/p/plplot/code/12947
Author: airwin
Date: 2014-01-22 09:03:05 +0000 (Wed, 22 Jan 2014)
Log Message:
-----------
For the MinGW case, install the *.o files that are created by the
plplotada library build. This installation is not required on Linux,
and even for the MinGW case gnatmake does not require these *.o files
to be installed in order to build the installed Ada examples, but when
those built examples are run, they immediately fail with a return code
of 3 unless these *.o files are installed. Therefore, I am pretty sure
this is a workaround for a MinGW gnatmake issue.
Modified Paths:
--------------
trunk/bindings/ada/CMakeLists.txt
Modified: trunk/bindings/ada/CMakeLists.txt
===================================================================
--- trunk/bindings/ada/CMakeLists.txt 2014-01-21 09:10:25 UTC (rev 12946)
+++ trunk/bindings/ada/CMakeLists.txt 2014-01-22 09:03:05 UTC (rev 12947)
@@ -47,6 +47,22 @@
${ALI_PREFIX}/plplot_auxiliary.ali
)
+ # I am pretty sure this is a workaround for a MinGW gnatmake bug
+ # since the installation of these files is not needed for Linux.
+ # However, without this workaround the standard examples build on
+ # MinGW/MSYS platforms without problems (so gnatmake is happy if the
+ # *.o files are not installed which is another indication we are
+ # dealing with a bug here), but at run-time the ada examples
+ # immediately return with a return code of 3.
+ if(MINGW)
+ list(APPEND ALI_LIST
+ ${ALI_PREFIX}/plplot.o
+ ${ALI_PREFIX}/plplot_thin.o
+ ${ALI_PREFIX}/plplot_traditional.o
+ ${ALI_PREFIX}/plplot_auxiliary.o
+ )
+ endif(MINGW)
+
set(plplotada${LIB_TAG}_LIB_SRCS)
foreach(SOURCE_FILE ${SOURCE_LIST})
list(APPEND plplotada${LIB_TAG}_LIB_SRCS
@@ -107,7 +123,7 @@
)
# Permissions of *.ali files in accordance with
- # http://www.ada-france.org/debian/debian-ada-policy.html
+ # http://people.debian.org/~lbrenta/debian-ada-policy.html
install(FILES ${ALI_LIST}
DESTINATION ${ADA_LIB_DIR}
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|