From 498fb3ae976f6128daefeb3a7f503985c11f8c91 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Thu, 27 Jun 2013 01:57:53 -0400 Subject: gras: revert cmake change, the corgon says its broken --- CMakeLists.txt | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 352095c..d91fb6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,16 +9,22 @@ set(GRAS_VERSION "0.0.0") set(GRAS_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(GRAS_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) -if(NOT EXISTS ${GRAS_SOURCE_DIR}/Theron/CMakeLists.txt) - find_program(GIT_EXECUTABLE names git eg) - message(STATUS "Cloning Git submodules. - ") - execute_process( - COMMAND ${GIT_EXECUTABLE} submodule init - COMMAND ${GIT_EXECUTABLE} submodule update - WORKING_DIRECTORY ${GRAS_SOURCE_DIR} - ) -endif(NOT EXISTS ${GRAS_SOURCE_DIR}/Theron/CMakeLists.txt) +function(GRAS_CHECK_SUBMODULE directory) + if(NOT EXISTS ${GRAS_SOURCE_DIR}/${directory}/CMakeLists.txt) + message(FATAL_ERROR " +submodule ${directory} does not exist!! +Did you remember to run the following commands? + git submodule init + git submodule update +") + endif() +endfunction(GRAS_CHECK_SUBMODULE) + +GRAS_CHECK_SUBMODULE(Theron) +GRAS_CHECK_SUBMODULE(Apology) +GRAS_CHECK_SUBMODULE(PMC) +GRAS_CHECK_SUBMODULE(gnuradio) +GRAS_CHECK_SUBMODULE(grextras) list(APPEND CMAKE_MODULE_PATH ${GRAS_SOURCE_DIR}/PMC/cmake/Modules) include(CMakeDefsHelper) -- cgit