FUNCTIONS: use cmake's generic build/install mechanism

1 files changed, 2 insertions, 9 deletions

diff --git a/FUNCTIONS b/FUNCTIONS
index 09c004786a..bb4d1854b9 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -678,10 +678,7 @@ cmake_build() {
   cd build              &&
   prepare_cmake_flags   &&
   if [[ $CMAKE_GEN == Ninja ]];then
-    MAKE=ninja
     OPTS+=" -G Ninja"
-  else
-    MAKE=make
   fi &&
 
   if [[ -z $1 ]];then
@@ -707,15 +704,11 @@ cmake_build() {
         -DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \
         -DCMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
          $OPTS ../  &&
-  $MAKE
+  cmake --build .
 }
 
 function cmake_install() {
-  if [[ $CMAKE_GEN == Ninja ]];then
-    ninja install
-  else
-    make install
-  fi
+  cmake --install .
 }
 
 qt4_cmake_build() {