From 8bd1c0c56d4cccbd8a350e53f7e252616b8701ae Mon Sep 17 00:00:00 2001 From: Stuart Berg Date: Fri, 3 Jan 2014 15:31:31 -0500 Subject: [PATCH] All make-based projects: Use $(MAKE) instead of 'make' for all commands, per the standard requirements for nested Makefiles. See GNU Make docs for $(MAKE) for details. --- README.md | 4 ++-- ann.cmake | 6 +++--- atlas.cmake | 6 +++--- blockedarray.cmake | 2 +- chatty.cmake | 4 ++-- cppunit.cmake | 6 +++--- dlib.cmake | 4 ++-- dos2unix.cmake | 4 ++-- doxygen.cmake | 4 ++-- emdata.cmake | 2 +- fontconfig.cmake | 6 +++--- freetype2.cmake | 4 ++-- glfw.cmake | 4 ++-- gmp.cmake | 6 +++--- gtest.cmake | 2 +- hdf5.cmake | 4 ++-- ilastik.cmake | 4 ++-- ilmbase.cmake | 2 +- lemon.cmake | 6 +++--- leveldb.cmake | 4 ++-- libfftw.cmake | 6 +++--- libjansson.cmake | 4 ++-- libjpeg.cmake | 4 ++-- libpng.cmake | 2 +- libtiff.cmake | 2 +- libxml2.cmake | 6 +++--- lmdb.cmake | 6 +++--- mpfr.cmake | 6 +++--- openblas.cmake | 4 ++-- opencv.cmake | 4 ++-- openexr.cmake | 2 +- openldap.cmake | 6 +++--- openssl.cmake | 4 ++-- openvdb.cmake | 6 +++--- pgmlink.cmake | 6 +++--- protobuf.cmake | 6 +++--- pyqt4.cmake | 4 ++-- python.cmake | 2 +- qt4.cmake | 6 +++--- raveler-utils.cmake | 2 +- sip.cmake | 4 ++-- snappy.cmake | 6 +++--- tbb.cmake | 2 +- thrift.cmake | 4 ++-- vigra.cmake | 4 ++-- vtk.cmake | 4 ++-- zlib.cmake | 2 +- 47 files changed, 99 insertions(+), 99 deletions(-) diff --git a/README.md b/README.md index 5ef7bae..3261f1f 100644 --- a/README.md +++ b/README.md @@ -209,9 +209,9 @@ ExternalProject_Add(${libtiff_NAME} --prefix=${BUILDEM_DIR} LDFLAGS=${BUILDEM_LDFLAGS} CPPFLAGS=-I${BUILDEM_DIR}/include - BUILD_COMMAND ${BUILDEM_ENV_STRING} make + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) BUILD_IN_SOURCE 1 - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ) endif (NOT libtiff_NAME) diff --git a/ann.cmake b/ann.cmake index 6157a9a..9928c54 100644 --- a/ann.cmake +++ b/ann.cmake @@ -34,9 +34,9 @@ ExternalProject_Add(${ann_NAME} -DCMAKE_PREFIX_PATH=${BUILDEM_DIR} - BUILD_COMMAND ${BUILDEM_ENV_STRING} make - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install - TEST_COMMAND "" # ${BUILDEM_ENV_STRING} make check + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install + TEST_COMMAND "" # ${BUILDEM_ENV_STRING} $(MAKE) check ) set_target_properties(${ann_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/atlas.cmake b/atlas.cmake index e49117b..be8adf7 100644 --- a/atlas.cmake +++ b/atlas.cmake @@ -74,9 +74,9 @@ ExternalProject_Add(${atlas_NAME} --shared --prefix=${BUILDEM_DIR} --with-netlib-lapack-tarfile=${lapack_FILE} - BUILD_COMMAND ${BUILDEM_ENV_STRING} make - TEST_COMMAND ${BUILDEM_ENV_STRING} make check - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) + TEST_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) check + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ) set (ENV{ATLAS} ${BUILDEM_DIR}/lib:${BUILDEM_DIR}/lib/libtatlas.so:${BUILDEM_DIR}/lib/libsatlas.so) diff --git a/blockedarray.cmake b/blockedarray.cmake index b61e60c..47dea10 100644 --- a/blockedarray.cmake +++ b/blockedarray.cmake @@ -43,7 +43,7 @@ ExternalProject_Add(${blockedarray_NAME} # blockedarray doesn't support a seperate install location. # Its output .so is copied directly into the source tree and used from there. - ###INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + ###INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install INSTALL_COMMAND "" ) diff --git a/chatty.cmake b/chatty.cmake index 55c6f18..cdc1687 100644 --- a/chatty.cmake +++ b/chatty.cmake @@ -39,8 +39,8 @@ ExternalProject_Add(${chatty_NAME} -DBoost_LIBRARY_DIRS=${BUILDEM_DIR}/lib ${chatty_SRC_DIR} - BUILD_COMMAND ${BUILDEM_ENV_STRING} make - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ) endif (NOT chatty_NAME) diff --git a/cppunit.cmake b/cppunit.cmake index 43ea5d7..82a6f9a 100644 --- a/cppunit.cmake +++ b/cppunit.cmake @@ -25,10 +25,10 @@ ExternalProject_Add(${cppunit_NAME} PATCH_COMMAND "" CONFIGURE_COMMAND ${BUILDEM_ENV_STRING} ./configure --prefix ${BUILDEM_DIR} - BUILD_COMMAND ${BUILDEM_ENV_STRING} make + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) BUILD_IN_SOURCE 1 - TEST_COMMAND make check - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + TEST_COMMAND $(MAKE) check + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ) set_target_properties(${cppunit_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/dlib.cmake b/dlib.cmake index 8d1416d..f20e40f 100644 --- a/dlib.cmake +++ b/dlib.cmake @@ -33,8 +33,8 @@ ExternalProject_Add(${dlib_NAME} -DCMAKE_PREFIX_PATH=${BUILDEM_DIR} - BUILD_COMMAND ${BUILDEM_ENV_STRING} make - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install TEST_COMMAND "" ) diff --git a/dos2unix.cmake b/dos2unix.cmake index 4e0312b..01f6d96 100644 --- a/dos2unix.cmake +++ b/dos2unix.cmake @@ -24,9 +24,9 @@ ExternalProject_Add(${dos2unix_NAME} UPDATE_COMMAND "" PATCH_COMMAND "" CONFIGURE_COMMAND "" - BUILD_COMMAND ${BUILDEM_ENV_STRING} make prefix=${BUILDEM_DIR} + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) prefix=${BUILDEM_DIR} BUILD_IN_SOURCE 1 - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make prefix=${BUILDEM_DIR} install + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) prefix=${BUILDEM_DIR} install ) set_target_properties(${dos2unix_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/doxygen.cmake b/doxygen.cmake index 0c3506b..a9e4b93 100644 --- a/doxygen.cmake +++ b/doxygen.cmake @@ -25,9 +25,9 @@ ExternalProject_Add(${doxygen_NAME} PATCH_COMMAND "" CONFIGURE_COMMAND ${BUILDEM_ENV_STRING} ./configure --prefix ${BUILDEM_DIR} - BUILD_COMMAND ${BUILDEM_ENV_STRING} make + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) BUILD_IN_SOURCE 1 - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ) set_target_properties(${doxygen_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/emdata.cmake b/emdata.cmake index e3cf809..3a7e09e 100644 --- a/emdata.cmake +++ b/emdata.cmake @@ -30,7 +30,7 @@ ExternalProject_Add(${emdata_NAME} UPDATE_COMMAND "" PATCH_COMMAND "" CONFIGURE_COMMAND ${BUILDEM_ENV_STRING} ${CMAKE_COMMAND} -DBUILDEM_DIR=${BUILDEM_DIR} ${emdata_SRC_DIR} - BUILD_COMMAND make + BUILD_COMMAND $(MAKE) TEST_COMMAND ${BUILDEM_ENV_STRING} ${BUILDEM_TEST_DIR}/test_encoder INSTALL_COMMAND "" ) diff --git a/fontconfig.cmake b/fontconfig.cmake index 623433f..4c3f3a5 100644 --- a/fontconfig.cmake +++ b/fontconfig.cmake @@ -38,9 +38,9 @@ if (NOT fontconfig_NAME) LDFLAGS=-L${BUILDEM_DIR}/lib LIBXML2_CFLAGS=-I${BUILDEM_DIR}/include/libxml2 LIBXML2_LIBS=-lxml2 FREETYPE_CFLAGS=-I${BUILDEM_DIR}/include/freetype2 FREETYPE_LIBS=-lfreetype - BUILD_COMMAND ${BUILDEM_ENV_STRING} make - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install - TEST_COMMAND ${BUILDEM_ENV_STRING} make check + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install + TEST_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) check ) diff --git a/freetype2.cmake b/freetype2.cmake index 4cb71a1..6c97dc4 100644 --- a/freetype2.cmake +++ b/freetype2.cmake @@ -30,9 +30,9 @@ ExternalProject_Add(${freetype2_NAME} --enable-shared LDFLAGS=${BUILDEM_LDFLAGS} CPPFLAGS=-I${BUILDEM_DIR}/include - BUILD_COMMAND ${BUILDEM_ENV_STRING} make + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) BUILD_IN_SOURCE 1 - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ) set_target_properties(${freetype_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/glfw.cmake b/glfw.cmake index 60fcc21..f99f2d6 100644 --- a/glfw.cmake +++ b/glfw.cmake @@ -32,9 +32,9 @@ ExternalProject_Add(${glfw_NAME} UPDATE_COMMAND "" PATCH_COMMAND "" CONFIGURE_COMMAND "" - BUILD_COMMAND ${BUILDEM_ENV_STRING} make ${MAKE_PLATFORM} + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) ${MAKE_PLATFORM} BUILD_IN_SOURCE 1 - INSTALL_COMMAND ${BUILDEM_ENV_STRING} PREFIX=${BUILDEM_DIR} make ${MAKE_PLATFORM}-dist-install + INSTALL_COMMAND ${BUILDEM_ENV_STRING} PREFIX=${BUILDEM_DIR} $(MAKE) ${MAKE_PLATFORM}-dist-install ) set_target_properties(${glfw_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/gmp.cmake b/gmp.cmake index 1f2a021..e2d9de7 100644 --- a/gmp.cmake +++ b/gmp.cmake @@ -27,10 +27,10 @@ ExternalProject_Add(${gmp_NAME} --prefix=${BUILDEM_DIR} LDFLAGS=${BUILDEM_LDFLAGS} CPPFLAGS=-I${BUILDEM_DIR}/include - BUILD_COMMAND ${BUILDEM_ENV_STRING} make + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) BUILD_IN_SOURCE 1 - TEST_COMMAND ${BUILDEM_ENV_STRING} make check - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + TEST_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) check + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ) set_target_properties(${gmp_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/gtest.cmake b/gtest.cmake index 46204e0..2e8c5fa 100644 --- a/gtest.cmake +++ b/gtest.cmake @@ -26,7 +26,7 @@ ExternalProject_Add(${gtest_NAME} CONFIGURE_COMMAND ${BUILDEM_ENV_STRING} ${CMAKE_COMMAND} ${gtest_SRC_DIR} -DCMAKE_INSTALL_PREFIX=${BUILDEM_DIR} -DCMAKE_PREFIX_PATH=${BUILDEM_DIR} - BUILD_COMMAND ${BUILDEM_ENV_STRING} make + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) BUILD_IN_SOURCE 1 INSTALL_COMMAND "" ) diff --git a/hdf5.cmake b/hdf5.cmake index 5b65079..66f1e0e 100644 --- a/hdf5.cmake +++ b/hdf5.cmake @@ -40,8 +40,8 @@ ExternalProject_Add(${hdf5_NAME} -DHDF5_ENABLE_Z_LIB_SUPPORT=ON # -DBUILD_TESTING=ON BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) -# TEST_COMMAND make check - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install +# TEST_COMMAND $(MAKE) check + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ) set_target_properties(${hdf5_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/ilastik.cmake b/ilastik.cmake index ddf8b57..623ed32 100644 --- a/ilastik.cmake +++ b/ilastik.cmake @@ -85,7 +85,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") -DPYTHON_NUMPY_INCLUDE_DIR=${PYTHON_PREFIX}/lib/python2.7/site-packages/numpy/core/include -DVIGRA_NUMPY_CORE_LIBRARY=${PYTHON_PREFIX}/lib/python2.7/site-packages/vigra/vigranumpycore.so ${lazyflow_SRC_DIR}/lazyflow/drtile - BUILD_COMMAND ${BUILDEM_ENV_STRING} make + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) TEST_COMMAND ${BUILDEM_DIR}/bin/ilastik_headless_test INSTALL_COMMAND "" ) @@ -103,7 +103,7 @@ else() # -DCMAKE_PREFIX_PATH=${BUILDEM_DIR} # -DVIGRA_ROOT=${BUILDEM_DIR} ${lazyflow_SRC_DIR}/lazyflow/drtile - BUILD_COMMAND ${BUILDEM_ENV_STRING} make + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) TEST_COMMAND ${BUILDEM_DIR}/bin/ilastik_headless_test INSTALL_COMMAND "" ) diff --git a/ilmbase.cmake b/ilmbase.cmake index c4a5527..c60a94b 100644 --- a/ilmbase.cmake +++ b/ilmbase.cmake @@ -42,7 +42,7 @@ ExternalProject_Add(${ilmbase_NAME} LDFLAGS=${BUILDEM_LDFLAGS} CPPFLAGS=-I${BUILDEM_DIR}/include BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ) set_target_properties(${ilmbase_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/lemon.cmake b/lemon.cmake index 67182c3..7a4eead 100644 --- a/lemon.cmake +++ b/lemon.cmake @@ -43,9 +43,9 @@ ExternalProject_Add(${lemon_NAME} -DGLPK_INCLUDE_DIR= -DGLPK_ROOT_DIR= - BUILD_COMMAND ${BUILDEM_ENV_STRING} make - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install - TEST_COMMAND ${BUILDEM_ENV_STRING} make check + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install + TEST_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) check ) set_target_properties(${lemon_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/leveldb.cmake b/leveldb.cmake index 91365d6..57a792c 100644 --- a/leveldb.cmake +++ b/leveldb.cmake @@ -29,7 +29,7 @@ if (${APPLE}) UPDATE_COMMAND "" PATCH_COMMAND "" CONFIGURE_COMMAND "" - BUILD_COMMAND ${BUILDEM_ENV_STRING} make + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) BUILD_IN_SOURCE 1 INSTALL_COMMAND ${CMAKE_COMMAND} -E copy ${leveldb_SRC_DIR}/libleveldb.dylib.${leveldb_RELEASE} ${BUILDEM_LIB_DIR}/libleveldb.dylib @@ -44,7 +44,7 @@ elseif (${UNIX}) UPDATE_COMMAND "" PATCH_COMMAND "" CONFIGURE_COMMAND "" - BUILD_COMMAND ${BUILDEM_ENV_STRING} make + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) BUILD_IN_SOURCE 1 INSTALL_COMMAND ${CMAKE_COMMAND} -E copy ${leveldb_SRC_DIR}/libleveldb.so.${leveldb_RELEASE} ${BUILDEM_LIB_DIR}/libleveldb.so diff --git a/libfftw.cmake b/libfftw.cmake index 4f85e10..d903cb9 100644 --- a/libfftw.cmake +++ b/libfftw.cmake @@ -29,7 +29,7 @@ ExternalProject_Add(${libfftw_NAME} LDFLAGS=${BUILDEM_LDFLAGS} CPPFLAGS=-I${BUILDEM_DIR}/include BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ) # Add additional steps to build and install the fftw single-precision libraries. @@ -49,13 +49,13 @@ ExternalProject_Add_Step(${libfftw_NAME} singlefloat-configure # build single-precision ExternalProject_Add_Step(${libfftw_NAME} singlefloat-build DEPENDEES singlefloat-configure - COMMAND cd ${libfftw_SRC_DIR}-build && ${BUILDEM_ENV_STRING} make + COMMAND cd ${libfftw_SRC_DIR}-build && ${BUILDEM_ENV_STRING} $(MAKE) ) # install single-precision ExternalProject_Add_Step(${libfftw_NAME} singlefloat-install DEPENDEES singlefloat-build - COMMAND cd ${libfftw_SRC_DIR}-build && ${BUILDEM_ENV_STRING} make install + COMMAND cd ${libfftw_SRC_DIR}-build && ${BUILDEM_ENV_STRING} $(MAKE) install ) set_target_properties(${libfftw_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/libjansson.cmake b/libjansson.cmake index b26e852..eb560a3 100644 --- a/libjansson.cmake +++ b/libjansson.cmake @@ -24,8 +24,8 @@ ExternalProject_Add(${libjansson_NAME} PATCH_COMMAND "" CONFIGURE_COMMAND ${BUILDEM_ENV_STRING} ${libjansson_SRC_DIR}/configure --prefix=${BUILDEM_DIR} --enable-shared URL http://www.digip.org/jansson/releases/jansson-2.4.tar.gz - BUILD_COMMAND ${BUILDEM_ENV_STRING} make - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ) endif (NOT libjansson_NAME) diff --git a/libjpeg.cmake b/libjpeg.cmake index 370516a..f2af00a 100644 --- a/libjpeg.cmake +++ b/libjpeg.cmake @@ -29,8 +29,8 @@ ExternalProject_Add(${libjpeg_NAME} CPPFLAGS=-I${BUILDEM_DIR}/include BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) LIBTOOL=./libtool # Must use the libtool that is built in place by the libjpeg Makfile (not the system libtool!) BUILD_IN_SOURCE 1 - TEST_COMMAND ${BUILDEM_ENV_STRING} make check - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make LIBTOOL=./libtool install + TEST_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) check + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) LIBTOOL=./libtool install ) set_target_properties(${libjpeg_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/libpng.cmake b/libpng.cmake index 862d03d..e253c09 100644 --- a/libpng.cmake +++ b/libpng.cmake @@ -37,7 +37,7 @@ ExternalProject_Add(${libpng_NAME} -DCMAKE_INSTALL_PREFIX=${BUILDEM_DIR} -DCMAKE_PREFIX_PATH=${BUILDEM_DIR} BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ) set_target_properties(${libpng_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/libtiff.cmake b/libtiff.cmake index 21e07ec..3575da9 100644 --- a/libtiff.cmake +++ b/libtiff.cmake @@ -41,7 +41,7 @@ ExternalProject_Add(${libtiff_NAME} --disable-jbig BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) BUILD_IN_SOURCE 1 - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ) set_target_properties(${libtiff_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/libxml2.cmake b/libxml2.cmake index 8983bdc..ff4a428 100644 --- a/libxml2.cmake +++ b/libxml2.cmake @@ -35,9 +35,9 @@ if (NOT libxml2_NAME) --with-sax1 LDFLAGS=${BUILDEM_LDFLAGS} CPPFLAGS=-I${BUILDEM_DIR}/include - BUILD_COMMAND ${BUILDEM_ENV_STRING} make - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install - TEST_COMMAND ${BUILDEM_ENV_STRING} make check + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install + TEST_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) check ) diff --git a/lmdb.cmake b/lmdb.cmake index a552a3f..ebef7d4 100644 --- a/lmdb.cmake +++ b/lmdb.cmake @@ -25,9 +25,9 @@ ExternalProject_Add(${lmdb_NAME} PATCH_COMMAND "" CONFIGURE_COMMAND "" BUILD_IN_SOURCE 1 - BUILD_COMMAND ${BUILDEM_ENV_STRING} make - TEST_COMMAND ${BUILDEM_ENV_STRING} make test - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install prefix=${BUILDEM_DIR} -i + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) + TEST_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) test + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install prefix=${BUILDEM_DIR} -i ) set_target_properties(${lmdb_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/mpfr.cmake b/mpfr.cmake index 6db8545..cdef3a0 100644 --- a/mpfr.cmake +++ b/mpfr.cmake @@ -31,10 +31,10 @@ ExternalProject_Add(${mpfr_NAME} --prefix=${BUILDEM_DIR} LDFLAGS=${BUILDEM_LDFLAGS} CPPFLAGS=-I${BUILDEM_DIR}/include - BUILD_COMMAND ${BUILDEM_ENV_STRING} make + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) BUILD_IN_SOURCE 1 - TEST_COMMAND ${BUILDEM_ENV_STRING} make check - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + TEST_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) check + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ) set_target_properties(${mpfr_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/openblas.cmake b/openblas.cmake index f3ec2ee..eabf9c7 100644 --- a/openblas.cmake +++ b/openblas.cmake @@ -22,9 +22,9 @@ ExternalProject_Add(${openblas_NAME} UPDATE_COMMAND "" PATCH_COMMAND "" CONFIGURE_COMMAND "" - BUILD_COMMAND make NO_AVX=1 NO_AFFINITY=1 -j8 + BUILD_COMMAND $(MAKE) NO_AVX=1 NO_AFFINITY=1 -j8 BUILD_IN_SOURCE 1 - INSTALL_COMMAND make PREFIX=${BUILDEM_DIR} install && + INSTALL_COMMAND $(MAKE) PREFIX=${BUILDEM_DIR} install && ln -fs libopenblas.so ${BUILDEM_DIR}/lib/libblas.so && ln -fs libopenblas.so ${BUILDEM_DIR}/lib/liblapack.so ) diff --git a/opencv.cmake b/opencv.cmake index d3ccf1e..10e64b8 100644 --- a/opencv.cmake +++ b/opencv.cmake @@ -38,8 +38,8 @@ ExternalProject_Add(${opencv_NAME} -DCMAKE_INSTALL_PREFIX=${BUILDEM_DIR} -DCMAKE_PREFIX_PATH=${BUILDEM_DIR} BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) -# TEST_COMMAND ${BUILDEM_ENV_STRING} make check - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install +# TEST_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) check + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ) set_target_properties(${opencv_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/openexr.cmake b/openexr.cmake index 8e1c531..ec6bf17 100644 --- a/openexr.cmake +++ b/openexr.cmake @@ -53,7 +53,7 @@ ExternalProject_Add(${openexr_NAME} LDFLAGS=${BUILDEM_LDFLAGS} CPPFLAGS=-I${BUILDEM_DIR}/include BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ) set_target_properties(${openexr_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/openldap.cmake b/openldap.cmake index ae6859c..478a1b7 100644 --- a/openldap.cmake +++ b/openldap.cmake @@ -31,10 +31,10 @@ ExternalProject_Add(${openldap_NAME} --disable-slapd LDFLAGS=${BUILDEM_LDFLAGS} CPPFLAGS=-I${BUILDEM_DIR}/include - BUILD_COMMAND ${BUILDEM_ENV_STRING} make depend + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) depend BUILD_IN_SOURCE 1 - TEST_COMMAND ${BUILDEM_ENV_STRING} make - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + TEST_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ) set_target_properties(${openldap_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/openssl.cmake b/openssl.cmake index b58a83b..64c743d 100644 --- a/openssl.cmake +++ b/openssl.cmake @@ -43,8 +43,8 @@ ExternalProject_Add(${openssl_NAME} zlib BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) BUILD_IN_SOURCE 1 - TEST_COMMAND ${BUILDEM_ENV_STRING} make test - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + TEST_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) test + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ) set_target_properties(${openssl_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/openvdb.cmake b/openvdb.cmake index 2c832a3..2e698b0 100644 --- a/openvdb.cmake +++ b/openvdb.cmake @@ -50,10 +50,10 @@ ExternalProject_Add(${openvdb_NAME} UPDATE_COMMAND "" PATCH_COMMAND "" CONFIGURE_COMMAND "" - BUILD_COMMAND ${BUILDEM_ENV_STRING} make ${OPENVDB_VALUES} + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) ${OPENVDB_VALUES} BUILD_IN_SOURCE 1 - TEST_COMMAND ${BUILDEM_ENV_STRING} make test - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install ${OPENVDB_VALUES} + TEST_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) test + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ${OPENVDB_VALUES} ) set_target_properties(${openvdb_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/pgmlink.cmake b/pgmlink.cmake index 236192f..e64bb17 100644 --- a/pgmlink.cmake +++ b/pgmlink.cmake @@ -37,7 +37,7 @@ else() set(TEST_STRING "") else (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(GIT_BRANCH "master") - set(TEST_STRING "${BUILDEM_ENV_STRING} make test") + set(TEST_STRING "${BUILDEM_ENV_STRING} $(MAKE) test") endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") external_git_repo (pgmlink @@ -63,8 +63,8 @@ else() -DPYTHON_LIBRARY=${PYTHON_LIBRARY_FILE} ${CMAKE_CPLEX_ROOT_DIR} - BUILD_COMMAND ${BUILDEM_ENV_STRING} make - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install TEST_COMMAND ${TEST_STRING} ) diff --git a/protobuf.cmake b/protobuf.cmake index 3986daf..a590b74 100644 --- a/protobuf.cmake +++ b/protobuf.cmake @@ -30,10 +30,10 @@ ExternalProject_Add(${protobuf_NAME} --enable-static LDFLAGS=${BUILDEM_LDFLAGS} CPPFLAGS=-I${BUILDEM_DIR}/include - BUILD_COMMAND ${BUILDEM_ENV_STRING} make + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) BUILD_IN_SOURCE 1 - TEST_COMMAND ${BUILDEM_ENV_STRING} make check - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + TEST_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) check + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ) set (protobuf_LIBRARIES ${BUILDEM_LIB_DIR}/libprotobuf.${BUILDEM_PLATFORM_DYLIB_EXTENSION}) diff --git a/pyqt4.cmake b/pyqt4.cmake index 00f9643..7266e77 100644 --- a/pyqt4.cmake +++ b/pyqt4.cmake @@ -54,8 +54,8 @@ ExternalProject_Add(${pyqt4_NAME} --confirm-license -q "${BUILDEM_DIR}/bin/qmake" ${EXTRA_PYQT4_CONFIG_FLAGS} - BUILD_COMMAND ${BUILDEM_ENV_STRING} make - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install BUILD_IN_SOURCE 1 ) diff --git a/python.cmake b/python.cmake index b2eda11..e8251ea 100644 --- a/python.cmake +++ b/python.cmake @@ -49,7 +49,7 @@ ExternalProject_Add(${python_NAME} LDFLAGS=${BUILDEM_LDFLAGS} CPPFLAGS=-I${BUILDEM_DIR}/include BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) PYTHONAPPSDIR=${BUILDEM_BIN_DIR}/${python_NAME} install BUILD_IN_SOURCE 1 # Required for Mac ) diff --git a/qt4.cmake b/qt4.cmake index 4046fd1..7695b2b 100644 --- a/qt4.cmake +++ b/qt4.cmake @@ -93,9 +93,9 @@ ExternalProject_Add(${qt4_NAME} -I${BUILDEM_DIR}/include -L${BUILDEM_DIR}/lib ${EXTRA_QT4_CONFIG_FLAGS} - BUILD_COMMAND ${BUILDEM_ENV_STRING} make - TEST_COMMAND ${BUILDEM_ENV_STRING} make check - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) + TEST_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) check + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ) set_target_properties(${qt4_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/raveler-utils.cmake b/raveler-utils.cmake index cabc8ab..ebdac04 100644 --- a/raveler-utils.cmake +++ b/raveler-utils.cmake @@ -17,7 +17,7 @@ ExternalProject_Add(${raveler_utils_NAME} UPDATE_COMMAND "" PATCH_COMMAND "" CONFIGURE_COMMAND ${BUILDEM_ENV_STRING} ${CMAKE_COMMAND} -DBUILDEM_DIR=${BUILDEM_DIR} ${raveler_utils_SRC_DIR} - BUILD_COMMAND make + BUILD_COMMAND $(MAKE) TEST_COMMAND "" INSTALL_COMMAND "" ) diff --git a/sip.cmake b/sip.cmake index 6f8dc42..0924a93 100644 --- a/sip.cmake +++ b/sip.cmake @@ -41,8 +41,8 @@ ExternalProject_Add(${sip_NAME} #-e ${PYTHON_PREFIX}/include/python2.7 #-v ${PYTHON_PREFIX}/share/sip - BUILD_COMMAND ${BUILDEM_ENV_STRING} make - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install BUILD_IN_SOURCE 1 ) diff --git a/snappy.cmake b/snappy.cmake index 17660bb..1fc9450 100644 --- a/snappy.cmake +++ b/snappy.cmake @@ -29,10 +29,10 @@ ExternalProject_Add(${snappy_NAME} --enable-static LDFLAGS=${BUILDEM_LDFLAGS} CPPFLAGS=-I${BUILDEM_DIR}/include - BUILD_COMMAND ${BUILDEM_ENV_STRING} make + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) BUILD_IN_SOURCE 1 - TEST_COMMAND ${BUILDEM_ENV_STRING} make check - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + TEST_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) check + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ) #ExternalProject_add_step(${snappy_NAME} install_includes diff --git a/tbb.cmake b/tbb.cmake index 60c7030..4d6bd59 100644 --- a/tbb.cmake +++ b/tbb.cmake @@ -24,7 +24,7 @@ ExternalProject_Add(${tbb_NAME} UPDATE_COMMAND "" PATCH_COMMAND "" CONFIGURE_COMMAND "" - BUILD_COMMAND ${BUILDEM_ENV_STRING} make + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) BUILD_IN_SOURCE 1 INSTALL_COMMAND "" ) diff --git a/thrift.cmake b/thrift.cmake index 5e1ca5b..509a786 100644 --- a/thrift.cmake +++ b/thrift.cmake @@ -46,9 +46,9 @@ ExternalProject_Add(${thrift_NAME} PY_PREFIX=${PYTHON_PREFIX} LDFLAGS=${BUILDEM_LDFLAGS} CPPFLAGS=-I${BUILDEM_DIR}/include - BUILD_COMMAND ${BUILDEM_ENV_STRING} make + BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) BUILD_IN_SOURCE 1 - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ) set (thrift_STATIC_LIBRARIES ${BUILDEM_LIB_DIR}/libthrift.a) diff --git a/vigra.cmake b/vigra.cmake index 027b222..2672db8 100644 --- a/vigra.cmake +++ b/vigra.cmake @@ -83,8 +83,8 @@ ExternalProject_Add(${vigra_NAME} -DCMAKE_CXX_FLAGS=-pthread -DCMAKE_CXX_LINK_FLAGS=-pthread BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) - TEST_COMMAND ${BUILDEM_ENV_STRING} make check - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + TEST_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) check + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ) set_target_properties(${vigra_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/vtk.cmake b/vtk.cmake index db5a5e5..87f3258 100644 --- a/vtk.cmake +++ b/vtk.cmake @@ -63,8 +63,8 @@ ExternalProject_Add(${vtk_NAME} # See: http://stackoverflow.com/questions/2942465/cmake-and-parallel-building-with-make-jn # And: http://www.cmake.org/pipermail/cmake/2011-April/043720.html BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) - #TEST_COMMAND ${BUILDEM_ENV_STRING} make check - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + #TEST_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) check + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ) set_target_properties(${vtk_NAME} PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/zlib.cmake b/zlib.cmake index e3b5264..f63277d 100644 --- a/zlib.cmake +++ b/zlib.cmake @@ -36,7 +36,7 @@ ExternalProject_Add(${zlib_NAME} BUILD_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) BUILD_IN_SOURCE 1 # Configure script reqiures BUILD_IN_SOURCE - INSTALL_COMMAND ${BUILDEM_ENV_STRING} make install + INSTALL_COMMAND ${BUILDEM_ENV_STRING} $(MAKE) install ) set_target_properties(${zlib_NAME} PROPERTIES EXCLUDE_FROM_ALL ON)