From 19481e64e6ca84260a2a5ec4b33b5f843f49a0ee Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 15 Oct 2015 01:32:35 +0200 Subject: [PATCH] [cmake] move some add_subdirectory out of the silly file MakeExe.cmake --- examples/s4u/CMakeLists.txt | 3 ++- tools/cmake/MakeExe.cmake | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/s4u/CMakeLists.txt b/examples/s4u/CMakeLists.txt index d11229375b..617d17066e 100644 --- a/examples/s4u/CMakeLists.txt +++ b/examples/s4u/CMakeLists.txt @@ -1,4 +1,5 @@ -cmake_minimum_required(VERSION 2.6) +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/basic) +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/io) set(tesh_files ${tesh_files} diff --git a/tools/cmake/MakeExe.cmake b/tools/cmake/MakeExe.cmake index 5831e11d5f..fd58228ccb 100644 --- a/tools/cmake/MakeExe.cmake +++ b/tools/cmake/MakeExe.cmake @@ -59,8 +59,6 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/tracing) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/s4u) -add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/s4u/basic) -add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/s4u/io) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/scala) add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/scala/master_slave_bypass) -- 2.20.1