|
@@ -304,7 +304,6 @@ set(__listSubLibs "")
|
|
|
foreach(_curSubdir ${__listSubDirs})
|
|
|
nice_get_real_path(__modpath "${NICE_CURR_DIR}/${_curSubdir}/")
|
|
|
if(EXISTS "${__modpath}/CMakeLists.txt")
|
|
|
- #ADD_SUBDIRECTORY(${__modpath})
|
|
|
LIST(APPEND __listSubLibs ${_curSubdir})
|
|
|
NICE_OPTION(BUILD_LIB_${_curSubdir} "Build library ${_curSubdir}" ON)
|
|
|
endif()
|
|
@@ -314,6 +313,7 @@ set(internal_deps "")
|
|
|
|
|
|
|
|
|
foreach(_curSubLib ${__listSubLibs})
|
|
|
+ if(BUILD_LIB_${_curSubLib})
|
|
|
nice_get_real_path(__modpath "${NICE_CURR_DIR}/${_curSubLib}")
|
|
|
message(STATUS "Scanning ${__modpath}...")
|
|
|
SUBDIRREC(__depDirs "${__modpath}")
|
|
@@ -322,12 +322,18 @@ foreach(_curSubLib ${__listSubLibs})
|
|
|
set(internal_deps ${internal_deps} ${_curSubLib}/${__depDir})
|
|
|
endforeach()
|
|
|
set(internal_deps ${internal_deps} ${_curSubLib})
|
|
|
+ else()
|
|
|
+ message(STATUS "${_curSubLib} is excluded from build")
|
|
|
+ endif()
|
|
|
endforeach()
|
|
|
|
|
|
message(STATUS "External dependencies found: ${external_deps}")
|
|
|
|
|
|
## Update deps
|
|
|
-UPDATE_NICE_DEPENDENCIES()
|
|
|
+NICE_OPTION(USE_LIBDEPEND "Use libdepend.inc files" OFF)
|
|
|
+if(USE_LIBDEPEND)
|
|
|
+ UPDATE_NICE_DEPENDENCIES()
|
|
|
+endif()
|
|
|
|
|
|
foreach(_curSublib ${__listSubLibs})
|
|
|
if(BUILD_LIB_${_curSublib})
|