Clemens-Alexander Brust 11 년 전
부모
커밋
2db2f0204f
2개의 변경된 파일8개의 추가작업 그리고 6개의 파일을 삭제
  1. 5 3
      CMakeLists.txt
  2. 3 3
      core/basics/libdepend.inc

+ 5 - 3
CMakeLists.txt

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

+ 3 - 3
core/basics/libdepend.inc

@@ -1,5 +1,5 @@
-$(call PKG_DEPEND_EXT,LINAL)
-$(call PKG_DEPEND_EXT,ZLIB)
-$(call PKG_DEPEND_EXT,BZLIB)
+# $(call PKG_DEPEND_EXT,LINAL)
+# $(call PKG_DEPEND_EXT,ZLIB)
+# $(call PKG_DEPEND_EXT,BZLIB)
 $(call PKG_DEPEND_EXT,OPENMP)