|
From: <ai...@us...> - 2013-06-26 06:03:58
|
Revision: 12388
http://sourceforge.net/p/plplot/code/12388
Author: airwin
Date: 2013-06-26 06:03:55 +0000 (Wed, 26 Jun 2013)
Log Message:
-----------
Attempted PLplot build ran into some errors for the "MinGW Makefiles"
generator for the libharu dependency of PLplot. So temporarily drop wxwidgets (to save time)
and plplot (to avoid this error) and do full test of remaining 5
builds (for libqhull, libharu, ndiff, ligagg, and shapelib) for all
combinations of generators.
Note, one of these tests was for "NMake
Makefiles JOM" for both C and C++ projects so I had to propagate
CMAKE_CXX_COMPILER (as well as the equivalent C and RC variables) for that case to work around the issues between
this generator and the MinGW suite of compilers.
All these tests were fine as measured by
grep -i warn build_all.out |grep -v "passing argument" |less
grep -i error build_all.out |grep -v "but argument is of type" |less
So this large number of tests should provide a good benchmark for when I reenable plplot again.
Tested by: Alan W. Irwin <ai...@us...> using the
"build_all" target for the "MSYS Makefiles", "MinGW Makefiles", "NMake
Makefiles JOM" (with CMAKE_CXX_COMPILER. etc., workaround), and "Ninja" generators on a wine-git version near
wine-1.6.0-rc1, and for the "Unix Makefiles" and "Ninja" generators on
Linux.
Modified Paths:
--------------
trunk/cmake/build_projects/CMakeLists.txt
Modified: trunk/cmake/build_projects/CMakeLists.txt
===================================================================
--- trunk/cmake/build_projects/CMakeLists.txt 2013-06-25 19:28:34 UTC (rev 12387)
+++ trunk/cmake/build_projects/CMakeLists.txt 2013-06-26 06:03:55 UTC (rev 12388)
@@ -141,12 +141,17 @@
# Propagate the overall CMake generator and install prefix to all CMake-based
# software project builds.
set(BP_CMAKE_COMMAND ${MSYS_CMAKE_COMMAND} "-G${CMAKE_GENERATOR}" -DCMAKE_INSTALL_PREFIX:PATH=${MSYS_CMAKE_INSTALL_PREFIX})
- # Propagate CMAKE_C_COMPILER and CMAKE_RC_COMPILER to all CMake-based
- # software project builds. (jom currently requires this as a workaround).
+ # Propagate CMAKE_C_COMPILER, CMAKE_CXX_COMPILER, and
+ # CMAKE_RC_COMPILER to all CMake-based software project builds.
+ # (jom currently requires this as a workaround).
if(CMAKE_C_COMPILER)
determine_msys_path(MSYS_CMAKE_C_COMPILER "${CMAKE_C_COMPILER}")
list(APPEND BP_CMAKE_COMMAND -DCMAKE_C_COMPILER:FILEPATH=${MSYS_CMAKE_C_COMPILER})
endif(CMAKE_C_COMPILER)
+ if(CMAKE_CXX_COMPILER)
+ determine_msys_path(MSYS_CMAKE_CXX_COMPILER "${CMAKE_CXX_COMPILER}")
+ list(APPEND BP_CMAKE_COMMAND -DCMAKE_CXX_COMPILER:FILEPATH=${MSYS_CMAKE_CXX_COMPILER})
+ endif(CMAKE_CXX_COMPILER)
if(CMAKE_RC_COMPILER)
determine_msys_path(MSYS_CMAKE_RC_COMPILER "${CMAKE_RC_COMPILER}")
list(APPEND BP_CMAKE_COMMAND -DCMAKE_RC_COMPILER:FILEPATH=${MSYS_CMAKE_RC_COMPILER})
@@ -203,9 +208,9 @@
libharu
libqhull
ndiff
- plplot
+# plplot
shapelib
- wxwidgets
+# wxwidgets
)
foreach(build_configuration ${build_configuration_LIST})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|