|
@@ -178,6 +178,7 @@ if(WITH_MATIO)
|
|
find_package(HDF5)
|
|
find_package(HDF5)
|
|
if(HDF5_FOUND)
|
|
if(HDF5_FOUND)
|
|
message(STATUS "HDF5-dir: ${HDF5_INCLUDE_DIR}")
|
|
message(STATUS "HDF5-dir: ${HDF5_INCLUDE_DIR}")
|
|
|
|
+ set (external_deps ${external_deps} "HDF5")
|
|
endif()
|
|
endif()
|
|
find_package(MATIO)
|
|
find_package(MATIO)
|
|
if(MATIO_FOUND)
|
|
if(MATIO_FOUND)
|
|
@@ -314,8 +315,9 @@ foreach(_curSubLib ${__listSubLibs})
|
|
set(internal_deps ${internal_deps} ${_curSubLib})
|
|
set(internal_deps ${internal_deps} ${_curSubLib})
|
|
endforeach()
|
|
endforeach()
|
|
|
|
|
|
-set(update_dependencies ON)
|
|
|
|
|
|
+message(STATUS "External dependencies found: ${external_deps}")
|
|
|
|
|
|
|
|
+set(update_dependencies ON)
|
|
while(update_dependencies)
|
|
while(update_dependencies)
|
|
message(STATUS "updating dependencies...")
|
|
message(STATUS "updating dependencies...")
|
|
set(update_dependencies OFF)
|
|
set(update_dependencies OFF)
|
|
@@ -345,7 +347,7 @@ while(update_dependencies)
|
|
endif()
|
|
endif()
|
|
|
|
|
|
list(LENGTH _extdependencies _extdepCount)
|
|
list(LENGTH _extdependencies _extdepCount)
|
|
- if(${_depCount} GREATER 0)
|
|
|
|
|
|
+ if(${_extdepCount} GREATER 0)
|
|
foreach(_extDep ${_extdependencies})
|
|
foreach(_extDep ${_extdependencies})
|
|
string(REGEX REPLACE "^[$][(]call( )+PKG_DEPEND_EXT,(.*)[)].*$" "\\2" _extDepName "${_extDep}")
|
|
string(REGEX REPLACE "^[$][(]call( )+PKG_DEPEND_EXT,(.*)[)].*$" "\\2" _extDepName "${_extDep}")
|
|
string(REGEX REPLACE "(.*)/$" "\\1" _extDepName ${_extDepName})
|
|
string(REGEX REPLACE "(.*)/$" "\\1" _extDepName ${_extDepName})
|
|
@@ -373,7 +375,7 @@ while(update_dependencies)
|
|
endwhile()
|
|
endwhile()
|
|
|
|
|
|
message(STATUS "Done.")
|
|
message(STATUS "Done.")
|
|
-message(STATUS "${internal_deps}")
|
|
|
|
|
|
+
|
|
foreach(_curSublib ${__listSubLibs})
|
|
foreach(_curSublib ${__listSubLibs})
|
|
if(BUILD_LIB_${_curSublib})
|
|
if(BUILD_LIB_${_curSublib})
|
|
nice_get_real_path(__modpath "${NICE_CURR_DIR}/${_curSublib}/")
|
|
nice_get_real_path(__modpath "${NICE_CURR_DIR}/${_curSublib}/")
|