diff --git a/cmake/cpp.cmake b/cmake/cpp.cmake
index 32731077fbd..2a3d795b242 100644
--- a/cmake/cpp.cmake
+++ b/cmake/cpp.cmake
@@ -467,8 +467,9 @@ function(add_cxx_example FILE_NAME)
 
   install(TARGETS ${EXAMPLE_NAME})
 
-  if(BUILD_TESTING)
-    add_test(NAME cxx_${COMPONENT_NAME}_${EXAMPLE_NAME} COMMAND ${EXAMPLE_NAME})
+  set(SKIP_TEST (${ARGC} GREATER 1) AND ${ARG1})
+  if(BUILD_TESTING AND NOT SKIP_TEST)
+      add_test(NAME cxx_${COMPONENT_NAME}_${EXAMPLE_NAME} COMMAND ${EXAMPLE_NAME})
   endif()
   message(STATUS "Configuring example ${FILE_NAME}: ...DONE")
 endfunction()
diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt
index ca4050a32bb..c0b157cc9f6 100644
--- a/examples/cpp/CMakeLists.txt
+++ b/examples/cpp/CMakeLists.txt
@@ -54,23 +54,8 @@ foreach(SAMPLE IN LISTS CXX_SRCS)
 endforeach()
 
 # Sat Runner
-include(GNUInstallDirs)
-if(APPLE)
-  set(CMAKE_INSTALL_RPATH
-    "@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
-elseif(UNIX)
-  set(CMAKE_INSTALL_RPATH
-    "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN/../lib64:$ORIGIN/../lib:$ORIGIN")
-endif()
-
-add_executable(sat_runner)
+add_cxx_example("${CMAKE_CURRENT_LIST_DIR}/sat_runner.cc" TRUE)
 target_sources(sat_runner PRIVATE
- "sat_runner.cc"
  "opb_reader.h"
  "sat_cnf_reader.h")
-target_include_directories(sat_runner PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-target_compile_features(sat_runner PRIVATE cxx_std_17)
-target_link_libraries(sat_runner PRIVATE ${PROJECT_NAMESPACE}::ortools)
-
-install(TARGETS sat_runner)