Index: Mk/Uses/cmake.mk =================================================================== --- Mk/Uses/cmake.mk +++ Mk/Uses/cmake.mk @@ -7,6 +7,7 @@ # Valid ARGS: outsource # ARGS description: # outsource perform an out-of-source build +# noninja don't use ninja instead of make # # # Additional variables that affect cmake behaviour: @@ -14,7 +15,6 @@ # User defined variables: # CMAKE_NOCOLOR - Disable colour build output # Default: not set, unless BATCH or PACKAGE_BUILDING is defined -# CMAKE_NINJA - Use ninja instead of make(1) # # Variables for ports: # CMAKE_ARGS - Arguments passed to cmake @@ -36,7 +36,7 @@ .if !defined(_INCLUDE_USES_CMAKE_MK) _INCLUDE_USES_CMAKE_MK= yes -_valid_ARGS= outsource run +_valid_ARGS= outsource run noninja # Sanity check .for arg in ${cmake_ARGS} @@ -91,7 +91,7 @@ CMAKE_ARGS+= -DCMAKE_COLOR_MAKEFILE:BOOL=OFF .endif -.if defined(CMAKE_NINJA) +.if empty(cmake_ARGS:Mnoninja) .include "${USESDIR}/ninja.mk" .endif