From 548d0db9d57351ba136ce47e84ccac222816c9a2 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Thu, 28 Jul 2016 13:31:07 +0200 Subject: [PATCH] skip inclusion of modules without CMakeLists + added hook for after load conf --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 143038b0f..747c3c803 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,6 +42,8 @@ if(EXISTS "conf/config.cmake") include(conf/config.cmake) endif() +RUN_HOOK("AFTER_LOAD_CONF") + # build in Release-mode by default if not explicitly set if( NOT CMAKE_BUILD_TYPE ) set(CMAKE_BUILD_TYPE "Release") @@ -85,8 +87,10 @@ include(src/cmake/showoptions.cmake) AZTH_SUBDIRLIST(sub_DIRS "${CMAKE_SOURCE_DIR}/modules" FALSE FALSE) FOREACH(subdir ${sub_DIRS}) STRING(REGEX REPLACE "^${CMAKE_SOURCE_DIR}/" "" subdir ${subdir}) - message("Loading module: ${subdir}") - add_subdirectory("${subdir}") + if(EXISTS "${subdir}/CMakeLists.txt") + message("Loading module: ${subdir}") + add_subdirectory("${subdir}") + endif() ENDFOREACH() RUN_HOOK("BEFORE_SRC_LOAD")