From: Sarah Hoffmann Date: Mon, 13 Feb 2017 20:02:49 +0000 (+0100) Subject: use properly cascading make for external make file X-Git-Tag: v3.0.0~74^2 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/e86516bbaf523ecf2ba714d85f61ff4e5ae1b0fa?hp=-c use properly cascading make for external make file If make is called directly then the -j option is not properly propagated. Instead make gives a warning 'No jobserver avilable'. --- e86516bbaf523ecf2ba714d85f61ff4e5ae1b0fa diff --git a/module/CMakeLists.txt b/module/CMakeLists.txt index f4fabe42..318e5650 100644 --- a/module/CMakeLists.txt +++ b/module/CMakeLists.txt @@ -1,6 +1,6 @@ # just use the pgxs makefile ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/dummy - COMMAND PGXS=${PGXS} PG_CONFIG=${PG_CONFIG} MODSRCDIR=${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MAKE_PROGRAM} -f ${CMAKE_CURRENT_SOURCE_DIR}/Makefile + COMMAND PGXS=${PGXS} PG_CONFIG=${PG_CONFIG} MODSRCDIR=${CMAKE_CURRENT_SOURCE_DIR} $(MAKE) -f ${CMAKE_CURRENT_SOURCE_DIR}/Makefile COMMENT "Running external makefile ${PGXS}" )