Skip to content
This repository has been archived by the owner on Jun 9, 2022. It is now read-only.

Commit

Permalink
All make-based projects: Use $(MAKE) instead of 'make' for all comman…
Browse files Browse the repository at this point in the history
…ds, per the standard requirements for nested Makefiles. See GNU Make docs for $(MAKE) for details.
  • Loading branch information
stuarteberg committed Jan 3, 2014
1 parent 0f00804 commit 8bd1c0c
Show file tree
Hide file tree
Showing 47 changed files with 99 additions and 99 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions ann.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions atlas.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion blockedarray.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
)

Expand Down
4 changes: 2 additions & 2 deletions chatty.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions cppunit.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions dlib.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
)

Expand Down
4 changes: 2 additions & 2 deletions dos2unix.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions doxygen.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion emdata.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
)
Expand Down
6 changes: 3 additions & 3 deletions fontconfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
)


Expand Down
4 changes: 2 additions & 2 deletions freetype2.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions glfw.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions gmp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion gtest.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
)
Expand Down
4 changes: 2 additions & 2 deletions hdf5.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions ilastik.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
)
Expand All @@ -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 ""
)
Expand Down
2 changes: 1 addition & 1 deletion ilmbase.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions lemon.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions leveldb.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions libfftw.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions libjansson.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
4 changes: 2 additions & 2 deletions libjpeg.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion libpng.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion libtiff.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions libxml2.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
)


Expand Down
6 changes: 3 additions & 3 deletions lmdb.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions mpfr.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions openblas.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
4 changes: 2 additions & 2 deletions opencv.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion openexr.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions openldap.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading

0 comments on commit 8bd1c0c

Please sign in to comment.