Commit 50dd0a1d authored by Naumann, Andreas's avatar Naumann, Andreas
Browse files

deb-repository seems working now

parent 5d6cae1a
...@@ -200,18 +200,22 @@ if(ENABLE_UMFPACK) ...@@ -200,18 +200,22 @@ if(ENABLE_UMFPACK)
FILE(GLOB UMFPACK_HEADERS "${LIB_DIR}/UMFPACK/Include/*.h") FILE(GLOB UMFPACK_HEADERS "${LIB_DIR}/UMFPACK/Include/*.h")
INSTALL(FILES ${UMFPACK_HEADERS} INSTALL(FILES ${UMFPACK_HEADERS}
DESTINATION include/amdis/umfpack/) DESTINATION include/amdis/umfpack/)
list(APPEND deb_add_dirs "include/amdis/umfpack")
FILE(GLOB UMFPACK_HEADERS "${LIB_DIR}/AMD/Include/*.h") FILE(GLOB UMFPACK_HEADERS "${LIB_DIR}/AMD/Include/*.h")
INSTALL(FILES ${UMFPACK_HEADERS} INSTALL(FILES ${UMFPACK_HEADERS}
DESTINATION include/amdis/amd/) DESTINATION include/amdis/amd/)
list(APPEND deb_add_dirs "include/amdis/amd")
FILE(GLOB HEADERS "${LIB_DIR}/UFconfig/*.h") FILE(GLOB HEADERS "${LIB_DIR}/UFconfig/*.h")
INSTALL(FILES ${HEADERS} INSTALL(FILES ${HEADERS}
DESTINATION include/amdis/ufconfig/) DESTINATION include/amdis/ufconfig/)
list(APPEND deb_add_dirs "include/amdis/ufconfig")
FILE(GLOB HEADERS "${LIB_DIR}/UFconfig/xerbla/*.h") FILE(GLOB HEADERS "${LIB_DIR}/UFconfig/xerbla/*.h")
INSTALL(FILES ${HEADERS} INSTALL(FILES ${HEADERS}
DESTINATION include/amdis/ufconfig/xerbla) DESTINATION include/amdis/ufconfig/xerbla)
list(APPEND deb_add_dirs "include/amdis/ufconfig/xerbla")
#add some rules to build the umfpack and amd libs #add some rules to build the umfpack and amd libs
# message("adding command for libumfpack:${CMAKE_CURRENT_SOURCE_DIR}/${LIB_DIR}/UMFPACK/Lib/libumfpack.a ") # message("adding command for libumfpack:${CMAKE_CURRENT_SOURCE_DIR}/${LIB_DIR}/UMFPACK/Lib/libumfpack.a ")
...@@ -227,8 +231,11 @@ if(ENABLE_UMFPACK) ...@@ -227,8 +231,11 @@ if(ENABLE_UMFPACK)
INSTALL(FILES ${LIB_DIR}/UMFPACK/Lib/libumfpack.a INSTALL(FILES ${LIB_DIR}/UMFPACK/Lib/libumfpack.a
DESTINATION lib/amdis/umfpack/) DESTINATION lib/amdis/umfpack/)
list(APPEND deb_add_dirs "lib/amdis/umfpack")
INSTALL(FILES ${LIB_DIR}/AMD/Lib/libamd.a INSTALL(FILES ${LIB_DIR}/AMD/Lib/libamd.a
DESTINATION lib/amdis/amd/) DESTINATION lib/amdis/amd/)
list(APPEND deb_add_dirs "lib/amdis/amd")
SET(RPM_DEPEND_STR "blas") SET(RPM_DEPEND_STR "blas")
LIST(APPEND AMDiS_LIBS amdis blas amd umfpack) LIST(APPEND AMDiS_LIBS amdis blas amd umfpack)
endif(ENABLE_UMFPACK) endif(ENABLE_UMFPACK)
...@@ -263,7 +270,7 @@ if(ENABLE_MARMOT) ...@@ -263,7 +270,7 @@ if(ENABLE_MARMOT)
Message("please set marmotcc manually") Message("please set marmotcc manually")
endif(ENABLE_MARMOT) endif(ENABLE_MARMOT)
set(deb_add_dirs "lib/amdis") list(APPEND deb_add_dirs "lib/amdis")
install(TARGETS amdis compositeFEM install(TARGETS amdis compositeFEM
LIBRARY DESTINATION lib/amdis/ ) LIBRARY DESTINATION lib/amdis/ )
...@@ -325,7 +332,7 @@ FILE(GLOB_RECURSE mtl4_files ...@@ -325,7 +332,7 @@ FILE(GLOB_RECURSE mtl4_files
${AMDiS_SOURCE_DIR}/lib/mtl4/boost/*.hpp) ${AMDiS_SOURCE_DIR}/lib/mtl4/boost/*.hpp)
foreach(mtl4_file in ${mtl4_files}) foreach(mtl4_file in ${mtl4_files})
get_filename_component(mtl4File_path ${mtl4_file} PATH) get_filename_component(mtl4File_path ${mtl4_file} PATH)
list(APPEND deb_add_dirs "include/amdis/mtl4/${mtl4File_path}") list(APPEND deb_add_dirs "include/amdis/mtl4/boost/${mtl4File_path}")
endforeach(mtl4_file) endforeach(mtl4_file)
list(REMOVE_DUPLICATES deb_add_dirs) list(REMOVE_DUPLICATES deb_add_dirs)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment