From 7cde55394062fc06a60b15ad84fa2fdfdd12e40a Mon Sep 17 00:00:00 2001 From: Andreas Naumann <andreas.naumann@tu-dresden.de> Date: Thu, 31 Mar 2011 11:36:57 +0000 Subject: [PATCH] capital i... --- AMDiS/AMDiSConfig.cmake.in | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/AMDiS/AMDiSConfig.cmake.in b/AMDiS/AMDiSConfig.cmake.in index e117d735..e96685a3 100644 --- a/AMDiS/AMDiSConfig.cmake.in +++ b/AMDiS/AMDiSConfig.cmake.in @@ -4,24 +4,24 @@ # AMDiS_INCLUDE_DIR the amdis-directory only # AMDiS_INCLUDE_DIRS all include directories (mtl, umfpack, parmetis, metis, ...) # AMDiS_LIBRARIES the needed libraries -# AMDiS_LIBRARY_DIRS the link directories +# AMDIS_LIBRARY_DIRS the link directories # AMDiS_COMPILEFLAGS some compile flags for amdis # # # For a fast start, you use this package in the following way # simply look for it, possibly set the AMDiS directory # find_package(AMDiS ) -# include(${AMDiS_USE_FILE}) +# include(${AMDIS_USE_FILE}) # add_executable(yourTarget <yourSources>) # target_link_libraries(yourTarget ${AMDiS_LIBRARIES}) # # -#The AMDiS_USE_FILE adds the include and link-directories for amdis to cmake. +#The AMDIS_USE_FILE adds the include and link-directories for amdis to cmake. # -#If you use the parallel amdis-version, the AMDiS_USE_FILE also trys to detect +#If you use the parallel amdis-version, the AMDIS_USE_FILE also trys to detect #the mpi and petsc configuration. If those versions don't fit your needs, #you can change the corresponding directories, or simply do this work at your own -#and omit the AMDiS_USE_FILE. Then you also have to set the flags, include +#and omit the AMDIS_USE_FILE. Then you also have to set the flags, include #and library directories. @@ -37,20 +37,20 @@ unset(_AMDiS_H CACHE) set(MTL_DIR ${AMDiS_INCLUDE_DIR}/mtl4 CACHE PATH "the mtl directory") list(APPEND AMDiS_INCLUDE_DIRS ${MTL_DIR}) -find_library(_AMDiS_LIB amdis PATHS ${AMDiS_LIBRARY_DIR} ${AMDiS_DIR}/../../lib/amdis/ /usr/include/amdis) +find_library(_AMDiS_LIB amdis PATHS ${AMDIS_LIBRARY_DIR} ${AMDiS_DIR}/../../lib/amdis/ /usr/include/amdis) if(_AMDiS_LIB) - get_filename_component(AMDiS_LIBRARY_DIR ${_AMDiS_LIB} PATH CACHE) - set(AMDiS_LIBRARY_DIRS ${AMDiS_LIBRARY_DIR}) - set(AMDiS_LIBRARIES "${_AMDiS_LIB};${AMDiS_LIBRARY_DIR}/libcompositeFEM.so" CACHE STRING "amdis libraries") + get_filename_component(AMDIS_LIBRARY_DIR ${_AMDiS_LIB} PATH CACHE) + set(AMDIS_LIBRARY_DIRS ${AMDIS_LIBRARY_DIR}) + set(AMDiS_LIBRARIES "${_AMDiS_LIB};${AMDIS_LIBRARY_DIR}/libcompositeFEM.so" CACHE STRING "amdis libraries") else() - message(ERROR "could not detect the AMDiS library directory. Please set the variable AMDiS_LIBRARY_DIR to the directory containg the AMDiS library") + message(ERROR "could not detect the AMDiS library directory. Please set the variable AMDIS_LIBRARY_DIR to the directory containg the AMDiS library") endif() unset(_AMDiS_LIB CACHE) find_package(Boost 1.42 REQUIRED system iostreams) if(Boost_FOUND) list(APPEND AMDiS_LIBRARIES ${Boost_LIBRARIES}) - list(APPEND AMDiS_LIBRARY_DIRS ${Boost_LIBRARY_DIRS}) + list(APPEND AMDIS_LIBRARY_DIRS ${Boost_LIBRARY_DIRS}) list(APPEND AMDiS_INCLUDE_DIRS ${Boost_INCLUDE_DIR}) endif(Boost_FOUND) @@ -59,7 +59,7 @@ set(AMDiS_NEED_ZOLTAN @ENABLE_ZOLTAN@) set(AMDiS_HAS_PARALLEL_DOMAIN @ENABLE_PARALLEL_DOMAIN@) set(AMDiS_NEED_UMFPACK @ENABLE_UMFPACK@) set(AMDiS_NEED_MKL @ENABLE_MKL@) -set(AMDiS_USE_FILE ${AMDiS_DIR}/AMDiSUse.cmake) +set(AMDIS_USE_FILE ${AMDiS_DIR}/AMDiSUse.cmake) set(AMDiS_COMPILEFLAGS "@COMPILEFLAGS@") if(AMDiS_NEED_UMFPACK) @@ -68,9 +68,9 @@ if(AMDiS_NEED_UMFPACK) if(NOT BLAS_LIBRARY) message(ERROR " could not find the blas library. please set the variable BLAS_LIBRARY to the blas library with full path") endif() - list(APPEND AMDiS_LIBRARIES ${AMDiS_LIBRARY_DIR}/umfpack/libumfpack.a ${AMDiS_LIBRARY_DIR}/amd/libamd.a ${BLAS_LIBRARY}) + list(APPEND AMDiS_LIBRARIES ${AMDIS_LIBRARY_DIR}/umfpack/libumfpack.a ${AMDIS_LIBRARY_DIR}/amd/libamd.a ${BLAS_LIBRARY}) #message("amdis-libs: ${AMDiS_LIBRARIES}") - list(APPEND AMDiS_LIBRARY_DIRS ${AMDiS_LIBRARY_DIR}/umfpack ${AMDiS_LIBRARY_DIR}/amd ${BLAS_LIBRARY_DIR}) + list(APPEND AMDIS_LIBRARY_DIRS ${AMDIS_LIBRARY_DIR}/umfpack ${AMDIS_LIBRARY_DIR}/amd ${BLAS_LIBRARY_DIR}) list(APPEND AMDiS_INCLUDE_DIRS ${AMDiS_INCLUDE_DIR}/umfpack ${AMDiS_INCLUDE_DIR}/amd @@ -87,8 +87,8 @@ if(${AMDiS_FIND_COMPONENTS} MATCHES umfpack ) endif() if( AMDiS_NEED_PARMETIS ) - list(APPEND AMDiS_LIBRARY_DIRS ${AMDiS_LIBRARY_DIR}/parmetis) - list(APPEND AMDiS_LIBRARIES ${AMDiS_LIBRARY_DIR}/parmetis/libparmetis.a ${AMDiS_LIBRARY_DIR}/parmetis/libmetis.a) + list(APPEND AMDIS_LIBRARY_DIRS ${AMDIS_LIBRARY_DIR}/parmetis) + list(APPEND AMDiS_LIBRARIES ${AMDIS_LIBRARY_DIR}/parmetis/libparmetis.a ${AMDIS_LIBRARY_DIR}/parmetis/libmetis.a) endif() if( AMDiS_NEED_ZOLTAN ) -- GitLab