|
From: <ai...@us...> - 2014-05-14 10:47:51
|
Revision: 13118
http://sourceforge.net/p/plplot/code/13118
Author: airwin
Date: 2014-05-14 10:47:48 +0000 (Wed, 14 May 2014)
Log Message:
-----------
Use -DTEST_DYNDRIVERS=OFF option for Windows case to work around the issue
where the simple test of dynamic loading works (i.e., it gives the
correct result) but for some strange reason has a non-zero return code
while the virtually identical PLplot dynamic loading works without the
non-zero return code.
Modified Paths:
--------------
trunk/cmake/epa_build/plplot/CMakeLists.txt
trunk/cmake/epa_build/plplot_lite/CMakeLists.txt
Modified: trunk/cmake/epa_build/plplot/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/plplot/CMakeLists.txt 2014-05-14 10:44:26 UTC (rev 13117)
+++ trunk/cmake/epa_build/plplot/CMakeLists.txt 2014-05-14 10:47:48 UTC (rev 13118)
@@ -89,6 +89,12 @@
#-DDEFAULT_NO_CAIRO_DEVICES:BOOL=ON
-DDEFAULT_NO_QT_DEVICES:BOOL=ON
-DENABLE_qt=OFF
+ # Also turn off simple testing of dynamically loaded devices
+ # because on Windows sometimes the simple test fails (in the
+ # sense of giving the correct result while generating a
+ # non-zero return code for unknown reasons) but the
+ # actual dynload done by the PLplot library succeeds for some reason.
+ -DTEST_DYNDRIVERS=OFF
)
endif(MSYS_PLATFORM)
Modified: trunk/cmake/epa_build/plplot_lite/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/plplot_lite/CMakeLists.txt 2014-05-14 10:44:26 UTC (rev 13117)
+++ trunk/cmake/epa_build/plplot_lite/CMakeLists.txt 2014-05-14 10:47:48 UTC (rev 13118)
@@ -70,6 +70,12 @@
-DDEFAULT_NO_CAIRO_DEVICES:BOOL=ON
-DDEFAULT_NO_QT_DEVICES:BOOL=ON
-DENABLE_qt=OFF
+ # Also turn off simple testing of dynamically loaded devices
+ # because on Windows sometimes the simple test fails (in the
+ # sense of giving the correct result while generating a
+ # non-zero return code for unknown reasons) but the
+ # actual dynload done by the PLplot library succeeds for some reason.
+ -DTEST_DYNDRIVERS=OFF
)
# Assumption that the top-level local PLplot source tree is two directories
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|