[Plplot-cvs] SF.net SVN: plplot:[12884] trunk/cmake/epa_build

[<ai...@us...>]

Revision: 12884
          http://sourceforge.net/p/plplot/code/12884
Author:   airwin
Date:     2013-12-19 01:40:05 +0000 (Thu, 19 Dec 2013)
Log Message:
-----------
Temporarily drop wxwidgets from epa_build because it is not required
for the plplot_lite epa_build configuration on Windows and Unix, the
plplot epa_build configuration does not work yet on Windows (because
of issues building the full set of PLplot dependencies), and the
plplot epa_build configuration on Unix of wxwidgets requires a
complete epa_build of the entire stack of gtk libraries in order to
have access to a consistent set of those libraries.

Modified Paths:
--------------
    trunk/cmake/epa_build/CMakeLists.txt
    trunk/cmake/epa_build/plplot/CMakeLists.txt
    trunk/cmake/epa_build/plplot_lite/CMakeLists.txt

Modified: trunk/cmake/epa_build/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/CMakeLists.txt	2013-12-19 01:35:00 UTC (rev 12883)
+++ trunk/cmake/epa_build/CMakeLists.txt	2013-12-19 01:40:05 UTC (rev 12884)
@@ -401,7 +401,6 @@
     ndiff
     plplot
     plplot_lite
-    wxwidgets
     pango
     qt4_lite
     )

Modified: trunk/cmake/epa_build/plplot/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/plplot/CMakeLists.txt	2013-12-19 01:35:00 UTC (rev 12883)
+++ trunk/cmake/epa_build/plplot/CMakeLists.txt	2013-12-19 01:40:05 UTC (rev 12884)
@@ -29,7 +29,6 @@
   libharu
   libqhull
   shapelib
-  wxwidgets
   pango
   qt4_lite
   )
@@ -50,7 +49,13 @@
 set(FFLAGS "$ENV{FFLAGS}")
 
 # Leave everything ON by default for plplot.
-set(cmake_args)
+# Except for turning off all wxwidgets dependencies temporarily because
+# of mixed linking issues until epa_build implements build configurations
+# for a consistent stack of libraries for all of gtk.
+set(cmake_args
+  -DPLD_wxwidgets=OFF
+  -DENABLE_wxwidgets=OFF
+  )
 
 # Assumption that the top-level local PLplot source tree is two directories
 # up from the present top-level directory for epa_build.
@@ -80,10 +85,15 @@
 
 if(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
   string(REGEX REPLACE ";" " " blank_delimited_cmake_args "${cmake_args}")
-  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/comprehensive_test.sh
-    "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --cmake_added_options \"${blank_delimited_cmake_args}\""
+
+  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/noninteractive_comprehensive_test.sh
+    "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --cmake_added_options \"${blank_delimited_cmake_args}\" --do_test_interactive no"
     )
-  set(TEST_COMMAND TEST_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/comprehensive_test.sh)
+
+  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/interactive_comprehensive_test.sh
+    "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --cmake_added_options \"${blank_delimited_cmake_args}\" --do_ctest no --do_test_noninteractive no"
+    )
+
 endif(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
 
 ExternalProject_Add(
@@ -94,6 +104,25 @@
   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
   INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND} install
   TEST_BEFORE_INSTALL OFF
-  ${TEST_COMMAND}
+  TEST_COMMAND ""
   STEP_TARGETS configure build install test
   )
+
+if(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
+  add_custom_command(
+    OUTPUT
+    ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-test
+    COMMAND ${CMAKE_COMMAND} -E echo "comprehensive noninteractive tests"
+    COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/noninteractive_comprehensive_test.sh
+    APPEND
+    )
+
+  add_custom_command(
+    OUTPUT
+    ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-test
+    COMMAND ${CMAKE_COMMAND} -E echo "comprehensive interactive tests"
+    COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/interactive_comprehensive_test.sh
+    APPEND
+    )
+
+endif(ENABLE_COMPREHENSIVE_PLPLOT_TEST)

Modified: trunk/cmake/epa_build/plplot_lite/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/plplot_lite/CMakeLists.txt	2013-12-19 01:35:00 UTC (rev 12883)
+++ trunk/cmake/epa_build/plplot_lite/CMakeLists.txt	2013-12-19 01:40:05 UTC (rev 12884)
@@ -84,10 +84,15 @@
 
 if(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
   string(REGEX REPLACE ";" " " blank_delimited_cmake_args "${cmake_args}")
-  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/comprehensive_test.sh
-    "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --cmake_added_options \"${blank_delimited_cmake_args}\""
+
+  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/noninteractive_comprehensive_test.sh
+    "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --cmake_added_options \"${blank_delimited_cmake_args}\" --do_test_interactive no"
     )
-  set(TEST_COMMAND TEST_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/comprehensive_test.sh)
+
+  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/interactive_comprehensive_test.sh
+    "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --cmake_added_options \"${blank_delimited_cmake_args}\" --do_ctest no --do_test_noninteractive no"
+    )
+
 endif(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
 
 ExternalProject_Add(
@@ -98,6 +103,25 @@
   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
   INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND} install
   TEST_BEFORE_INSTALL OFF
-  ${TEST_COMMAND}
+  TEST_COMMAND ""
   STEP_TARGETS configure build install test
   )
+
+if(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
+  add_custom_command(
+    OUTPUT
+    ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-test
+    COMMAND ${CMAKE_COMMAND} -E echo "comprehensive noninteractive tests"
+    COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/noninteractive_comprehensive_test.sh
+    APPEND
+    )
+
+  add_custom_command(
+    OUTPUT
+    ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-test
+    COMMAND ${CMAKE_COMMAND} -E echo "comprehensive interactive tests"
+    COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/interactive_comprehensive_test.sh
+    APPEND
+    )
+
+endif(ENABLE_COMPREHENSIVE_PLPLOT_TEST)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.