Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Backofen, Rainer
amdis
Commits
2a1849f9
Commit
2a1849f9
authored
Feb 15, 2013
by
Praetorius, Simon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MS Windows compatibility
parent
2e10969e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
14 deletions
+20
-14
AMDiS/AMDISConfig.cmake.in
AMDiS/AMDISConfig.cmake.in
+11
-5
AMDiS/CMakeLists.txt
AMDiS/CMakeLists.txt
+9
-9
No files found.
AMDiS/AMDISConfig.cmake.in
View file @
2a1849f9
...
...
@@ -41,11 +41,17 @@ unset(_AMDIS_H CACHE)
set(MTL_DIR ${AMDIS_INCLUDE_DIR}/mtl4 CACHE PATH "the mtl directory")
list(APPEND AMDIS_INCLUDE_DIRS ${MTL_DIR})
if(WIN32)
set(LIBEXT lib)
else
set(LIBEXT so)
endif()
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}/libmuparser.
so
" CACHE STRING "amdis libraries")
set(AMDIS_LIBRARIES "${_AMDIS_LIB};${AMDIS_LIBRARY_DIR}/libmuparser.
${LIBEXT}
" 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")
endif()
...
...
@@ -183,12 +189,12 @@ if(AMDIS_NEED_EXTENSIONS)
list(APPEND AMDIS_INCLUDE_DIRS ${AMDIS_INCLUDE_DIR}/extensions/time)
list(APPEND AMDIS_INCLUDE_DIRS ${AMDIS_INCLUDE_DIR}/extensions/nanoflann)
list(APPEND AMDIS_INCLUDE_DIRS ${AMDIS_INCLUDE_DIR}/extensions/pugixml)
list(APPEND AMDIS_LIBRARIES ${AMDIS_LIBRARY_DIR}/libextensions.
so
)
list(APPEND AMDIS_LIBRARIES ${AMDIS_LIBRARY_DIR}/libextensions.
${LIBEXT}
)
endif(AMDIS_NEED_EXTENSIONS)
if(AMDIS_NEED_BASE_PROBLEMS)
list(APPEND AMDIS_INCLUDE_DIRS ${AMDIS_INCLUDE_DIR}/base_problems)
list(APPEND AMDIS_LIBRARIES ${AMDIS_LIBRARY_DIR}/libbase_problems.
so
)
list(APPEND AMDIS_LIBRARIES ${AMDIS_LIBRARY_DIR}/libbase_problems.
${LIBEXT}
)
endif(AMDIS_NEED_BASE_PROBLEMS)
#add directories for reinit
...
...
@@ -196,8 +202,8 @@ list(APPEND AMDIS_INCLUDE_DIRS ${AMDIS_INCLUDE_DIR}/reinit)
list(APPEND AMDIS_INCLUDE_DIRS ${AMDIS_INCLUDE_DIR}/compositeFEM)
list(APPEND AMDIS_INCLUDE_DIRS ${AMDIS_INCLUDE_DIR}/muparser)
list(APPEND AMDIS_LIBRARIES ${AMDIS_LIBRARY_DIR}/libcompositeFEM.
so
)
list(APPEND AMDIS_LIBRARIES ${AMDIS_LIBRARY_DIR}/libreinit.
so
)
list(APPEND AMDIS_LIBRARIES ${AMDIS_LIBRARY_DIR}/libcompositeFEM.
${LIBEXT}
)
list(APPEND AMDIS_LIBRARIES ${AMDIS_LIBRARY_DIR}/libreinit.
${LIBEXT}
)
if(${AMDIS_FIND_COMPONENTS} MATCHES umfpack )
if(NOT AMDIS_NEED_UMFPACK)
...
...
AMDiS/CMakeLists.txt
View file @
2a1849f9
...
...
@@ -378,7 +378,7 @@ if(ENABLE_EXTENSIONS)
list
(
APPEND AMDIS_INCLUDE_DIRS
${
EXTENSIONS_DIR
}
/time
)
list
(
APPEND AMDIS_INCLUDE_DIRS
${
EXTENSIONS_DIR
}
/nanoflann
)
list
(
APPEND AMDIS_INCLUDE_DIRS
${
EXTENSIONS_DIR
}
/pugixml/src
)
add_library
(
extensions S
HARED
${
EXTENSIONS_SRC
}
)
add_library
(
extensions S
TATIC
${
EXTENSIONS_SRC
}
)
list
(
APPEND AMDIS_LIBS extensions
)
FILE
(
GLOB HEADERS
"
${
EXTENSIONS_DIR
}
/*.h"
)
...
...
@@ -412,7 +412,7 @@ if(ENABLE_EXTENSIONS)
list
(
APPEND deb_add_dirs
"include/amdis/extensions/pugixml"
)
install
(
TARGETS extensions
LIBRARY
DESTINATION lib/amdis/
)
DESTINATION lib/amdis/
)
# === baseProblems ====================================================================
...
...
@@ -437,7 +437,7 @@ if(ENABLE_EXTENSIONS)
${
EXTENSIONS_DIR
}
/base_problems/PhaseFieldCrystal_RB.cc
)
list
(
APPEND COMPILEFLAGS
"-DHAVE_BASE_PROBLEMS=1"
)
list
(
APPEND AMDIS_INCLUDE_DIRS
${
EXTENSIONS_DIR
}
/base_problems
)
add_library
(
base_problems S
HARED
${
BASE_PROBLEMS_SRC
}
)
add_library
(
base_problems S
TATIC
${
BASE_PROBLEMS_SRC
}
)
list
(
APPEND AMDIS_LIBS base_problems
)
FILE
(
GLOB HEADERS
"
${
EXTENSIONS_DIR
}
/base_problems/*.h"
)
...
...
@@ -450,7 +450,7 @@ if(ENABLE_EXTENSIONS)
list
(
APPEND deb_add_dirs
"include/amdis/base_problems"
)
install
(
TARGETS base_problems
LIBRARY
DESTINATION lib/amdis/
)
DESTINATION lib/amdis/
)
endif
(
ENABLE_BASE_PROBLEMS
)
endif
()
...
...
@@ -495,10 +495,10 @@ list(APPEND AMDIS_INCLUDE_DIRS ${SOURCE_DIR})
#include_directories(${SOURCE_DIR})
include_directories
(
${
AMDIS_INCLUDE_DIRS
}
)
add_library
(
amdis S
HARED
${
AMDIS_SRC
}
${
PARALLEL_DOMAIN_AMDIS_SRC
}
)
add_library
(
compositeFEM S
HARED
${
COMPOSITE_FEM_SRC
}
)
add_library
(
reinit S
HARED
${
REINIT_SRC
}
)
add_library
(
muparser S
HARED
${
MUPARSER_SRC
}
)
add_library
(
amdis S
TATIC
${
AMDIS_SRC
}
${
PARALLEL_DOMAIN_AMDIS_SRC
}
)
add_library
(
compositeFEM S
TATIC
${
COMPOSITE_FEM_SRC
}
)
add_library
(
reinit S
TATIC
${
REINIT_SRC
}
)
add_library
(
muparser S
TATIC
${
MUPARSER_SRC
}
)
#target_link_libraries(compositeFEM amdis)
#target_link_libraries(reinit amdis)
...
...
@@ -577,7 +577,7 @@ list(APPEND deb_add_dirs "include/amdis/muparser")
list
(
APPEND deb_add_dirs
"lib/amdis"
)
install
(
TARGETS amdis compositeFEM reinit muparser
LIBRARY
DESTINATION lib/amdis/
)
DESTINATION lib/amdis/
)
configure_file
(
${
AMDIS_SOURCE_DIR
}
/AMDISConfig.cmake.in
${
AMDIS_BINARY_DIR
}
/AMDISConfig.cmake
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment