Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
iwr
amdis
Commits
4beefa8c
Commit
4beefa8c
authored
Feb 19, 2013
by
Praetorius, Simon
Browse files
CMakeLists.txt fixed
parent
014e5191
Changes
1
Hide whitespace changes
Inline
Side-by-side
AMDiS/CMakeLists.txt
View file @
4beefa8c
...
...
@@ -268,7 +268,7 @@ if(ENABLE_PARALLEL_DOMAIN)
${
SOURCE_DIR
}
/parallel/PetscSolverGlobalMatrix.cc
${
SOURCE_DIR
}
/parallel/PetscSolverGlobalBlockMatrix.cc
${
SOURCE_DIR
}
/parallel/PetscSolverNavierStokes.cc
${
SOURCE_DIR
}
/parallel/PetscSolverNSCH.cc
${
SOURCE_DIR
}
/parallel/PetscSolverNSCH.cc
${
SOURCE_DIR
}
/parallel/PetscSolverCahnHilliard2.cc
${
SOURCE_DIR
}
/parallel/PetscSolverCahnHilliard.cc
${
SOURCE_DIR
}
/parallel/PetscSolverSchur.cc
)
...
...
@@ -379,7 +379,11 @@ 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 STATIC
${
EXTENSIONS_SRC
}
)
if
(
WIN32
)
add_library
(
extensions STATIC
${
EXTENSIONS_SRC
}
)
else
()
add_library
(
extensions SHARED
${
EXTENSIONS_SRC
}
)
endif
()
list
(
APPEND AMDIS_LIBS extensions
)
FILE
(
GLOB HEADERS
"
${
EXTENSIONS_DIR
}
/*.h"
)
...
...
@@ -426,9 +430,8 @@ if(ENABLE_EXTENSIONS)
${
EXTENSIONS_DIR
}
/base_problems/LinearElasticity.cc
${
EXTENSIONS_DIR
}
/base_problems/LinearElasticityPhase.cc
# ${EXTENSIONS_DIR}/base_problems/NavierStokes_Chorin.cc
#
${EXTENSIONS_DIR}/base_problems/NavierStokes
Phase_Chorin
.cc
${
EXTENSIONS_DIR
}
/base_problems/NavierStokes
CahnHilliard
.cc
${
EXTENSIONS_DIR
}
/base_problems/NavierStokesPhase_TaylorHood.cc
${
EXTENSIONS_DIR
}
/base_problems/NavierStokesCahnHilliard.cc
${
EXTENSIONS_DIR
}
/base_problems/NavierStokes_TaylorHood.cc
${
EXTENSIONS_DIR
}
/base_problems/NavierStokes_TaylorHood_RB.cc
${
EXTENSIONS_DIR
}
/base_problems/NavierStokes_TH_MultiPhase.cc
...
...
@@ -439,7 +442,11 @@ 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 STATIC
${
BASE_PROBLEMS_SRC
}
)
if
(
WIN32
)
add_library
(
base_problems STATIC
${
BASE_PROBLEMS_SRC
}
)
else
()
add_library
(
base_problems SHARED
${
BASE_PROBLEMS_SRC
}
)
endif
()
list
(
APPEND AMDIS_LIBS base_problems
)
FILE
(
GLOB HEADERS
"
${
EXTENSIONS_DIR
}
/base_problems/*.h"
)
...
...
@@ -497,10 +504,17 @@ list(APPEND AMDIS_INCLUDE_DIRS ${SOURCE_DIR})
#include_directories(${SOURCE_DIR})
include_directories
(
${
AMDIS_INCLUDE_DIRS
}
)
add_library
(
amdis STATIC
${
AMDIS_SRC
}
${
PARALLEL_DOMAIN_AMDIS_SRC
}
)
add_library
(
compositeFEM STATIC
${
COMPOSITE_FEM_SRC
}
)
add_library
(
reinit STATIC
${
REINIT_SRC
}
)
add_library
(
muparser STATIC
${
MUPARSER_SRC
}
)
if
(
WIN32
)
add_library
(
amdis STATIC
${
AMDIS_SRC
}
${
PARALLEL_DOMAIN_AMDIS_SRC
}
)
add_library
(
compositeFEM STATIC
${
COMPOSITE_FEM_SRC
}
)
add_library
(
reinit STATIC
${
REINIT_SRC
}
)
add_library
(
muparser STATIC
${
MUPARSER_SRC
}
)
else
()
add_library
(
amdis SHARED
${
AMDIS_SRC
}
${
PARALLEL_DOMAIN_AMDIS_SRC
}
)
add_library
(
compositeFEM SHARED
${
COMPOSITE_FEM_SRC
}
)
add_library
(
reinit SHARED
${
REINIT_SRC
}
)
add_library
(
muparser SHARED
${
MUPARSER_SRC
}
)
endif
()
#target_link_libraries(compositeFEM amdis)
#target_link_libraries(reinit amdis)
...
...
Write
Preview
Supports
Markdown
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