diff --git a/Packaging/Files/build_examples.cmake b/Packaging/Files/build_examples.cmake
index 889012eb58bb633e433c6d9daa54abd8b370eb0d..a332bf00aeb9849bbe6c192de6e5e19748012010 100644
--- a/Packaging/Files/build_examples.cmake
+++ b/Packaging/Files/build_examples.cmake
@@ -2,12 +2,7 @@ if(NOT SRC_DIR)
   message(FATAL_ERROR "SRC_DIR is not set")
 endif()
 
-if(NOT MAKE_PROGRAM)
-  message(FATAL_ERROR "MAKE_PROGRAM is not set")
-endif()
-
 set(PKG_DIR)
-
 get_filename_component(PKG_DIR ${CMAKE_CURRENT_LIST_DIR} PATH)
 set(TEST_DIR ${PKG_DIR}/ex_build)
 
@@ -20,7 +15,6 @@ endif()
 message("TEST_DIR=${TEST_DIR}")
 message("PKG_DIR=${PKG_DIR}")
 message("SRC_DIR=${SRC_DIR}")
-message("MAKE_PROGRAM=${MAKE_PROGRAM}")
 
 # if( "${CMAKE_SYSTEM_NAME}"  MATCHES "Linux")
 #   find_program(GREP grep)
@@ -58,7 +52,9 @@ endif()
 # If you want to test building a third targert, use foreach.
 # the code is written in a way that it is easy to stuff these two
 # into a cmake foreach
-execute_process(COMMAND ${MAKE_PROGRAM} HelloWorldOTB
+execute_process(COMMAND ${CMAKE_COMMAND}
+  --build ${TEST_DIR}
+  --target HelloWorldOTB
   WORKING_DIRECTORY ${TEST_DIR}
   RESULT_VARIABLE build_HelloWorldOTB_rv
   OUTPUT_VARIABLE build_HelloWorldOTB_ov
@@ -72,7 +68,9 @@ else()
   message("Build PASSED. build_HelloWorldOTB_ov:\n${build_HelloWorldOTB_ov}")
 endif()
 
-execute_process(COMMAND ${MAKE_PROGRAM} Pipeline
+execute_process(COMMAND ${CMAKE_COMMAND}
+  --build ${TEST_DIR}
+  --target Pipeline
   WORKING_DIRECTORY ${TEST_DIR}
   RESULT_VARIABLE build_Pipeline_rv
   OUTPUT_VARIABLE build_Pipeline_ov
diff --git a/Packaging/testing.cmake b/Packaging/testing.cmake
index 93e3a6fc45a4142cc1ef36d17f8fb4f658bf92d8..aaa176c1ef0afd78b924f3bfc535e135300f9641 100644
--- a/Packaging/testing.cmake
+++ b/Packaging/testing.cmake
@@ -46,7 +46,6 @@ add_test(
   NAME Tu_build_examples
   COMMAND ${CMAKE_COMMAND}
   -DSRC_DIR=${CMAKE_SOURCE_DIR}/../Examples
-  -DMAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
   -P ${pkg_extracted_dir}/tools/build_examples.cmake
   WORKING_DIRECTORY ${testing_dir}
   )