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

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

Revision: 12923
          http://sourceforge.net/p/plplot/code/12923
Author:   airwin
Date:     2014-01-06 20:51:38 +0000 (Mon, 06 Jan 2014)
Log Message:
-----------
Implement the BUILD_COMMAND variable which is a variable that
contains the name of the correct build command for the generator.

Drop MAKE_COMMAND if it has been implemented.  I prefer the variable
name BUILD_COMMAND instead because some generators (e.g., ninja) use a
build command that has nothing to do with make.

Modified Paths:
--------------
    trunk/cmake/epa_build/setup/setup_linux_makefiles
    trunk/cmake/epa_build/setup/setup_mingw_makefiles
    trunk/cmake/epa_build/setup/setup_msys_makefiles

Modified: trunk/cmake/epa_build/setup/setup_linux_makefiles
===================================================================
--- trunk/cmake/epa_build/setup/setup_linux_makefiles	2014-01-06 20:41:54 UTC (rev 12922)
+++ trunk/cmake/epa_build/setup/setup_linux_makefiles	2014-01-06 20:51:38 UTC (rev 12923)
@@ -56,4 +56,7 @@
 # so they are only used as a last resort.
 PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig
 
+# BUILD_COMMAND contains the appropriate build command for this generator.
+export BUILD_COMMAND=make
+
 export GENERATOR_STRING="Unix Makefiles"

Modified: trunk/cmake/epa_build/setup/setup_mingw_makefiles
===================================================================
--- trunk/cmake/epa_build/setup/setup_mingw_makefiles	2014-01-06 20:41:54 UTC (rev 12922)
+++ trunk/cmake/epa_build/setup/setup_mingw_makefiles	2014-01-06 20:51:38 UTC (rev 12923)
@@ -31,8 +31,9 @@
 # Put install-location pkg-config directories at top of PKG_CONFIG_PATH
 PKG_CONFIG_PATH=$INSTALL_PREFIX/share/pkgconfig:$INSTALL_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH
 
-# MAKE_COMMAND contains the appropriate make command for this generator.
-export MAKE_COMMAND=mingw32-make
+# BUILD_COMMAND contains the appropriate build command for this generator.
+export BUILD_COMMAND=make
+export BUILD_COMMAND=mingw32-make
 
 # Apparently the presence of sh.exe on the PATH is a signal to
 # mingw32-make.exe to use different (incorrect from the CMake point of

Modified: trunk/cmake/epa_build/setup/setup_msys_makefiles
===================================================================
--- trunk/cmake/epa_build/setup/setup_msys_makefiles	2014-01-06 20:41:54 UTC (rev 12922)
+++ trunk/cmake/epa_build/setup/setup_msys_makefiles	2014-01-06 20:51:38 UTC (rev 12923)
@@ -31,8 +31,8 @@
 # Put install-location pkg-config directories at top of PKG_CONFIG_PATH
 PKG_CONFIG_PATH=$INSTALL_PREFIX/share/pkgconfig:$INSTALL_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH
 
-# MAKE_COMMAND contains the appropriate make command for this generator.
-export MAKE_COMMAND=make
+# BUILD_COMMAND contains the appropriate build command for this generator.
+export BUILD_COMMAND=make
 
 # Put MSYS at the top of the PATH
 PATH=$MINGW_PREFIX/msys/1.0/bin/:$PATH

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