From 3c0193b79675ced9bb29ee76c18b51511d1fe390 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Tue, 15 Jan 2019 06:51:05 +0100 Subject: [PATCH] FEM: cmake, sort solver modules --- src/Mod/Fem/CMakeLists.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 44a79d9a8f..21433f91e6 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -74,6 +74,13 @@ SET(FemSolver_SRCS femsolver/writerbase.py ) +SET(FemSolverCalculix_SRCS + femsolver/calculix/__init__.py + femsolver/calculix/solver.py + femsolver/calculix/tasks.py + femsolver/calculix/writer.py +) + SET(FemSolverElmer_SRCS femsolver/elmer/__init__.py femsolver/elmer/sifio.py @@ -94,11 +101,9 @@ SET(FemSolverElmerEquations_SRCS femsolver/elmer/equations/nonlinear.py ) -SET(FemSolverCalculix_SRCS - femsolver/calculix/__init__.py - femsolver/calculix/solver.py - femsolver/calculix/tasks.py - femsolver/calculix/writer.py +SET(FemSolverFenics_SRCS + femsolver/fenics/__init__.py + femsolver/fenics/fenics_tools.py ) SET(FemSolverZ88_SRCS @@ -108,11 +113,6 @@ SET(FemSolverZ88_SRCS femsolver/z88/writer.py ) -SET(FemSolverFenics_SRCS - femsolver/fenics/__init__.py - femsolver/fenics/fenics_tools.py -) - SET(FemTests_SRCS femtest/__init__.py femtest/testccxtools.py @@ -211,8 +211,8 @@ SET(FemAllScripts ${FemSolverCalculix_SRCS} ${FemSolverElmer_SRCS} ${FemSolverElmerEquations_SRCS} - ${FemSolverZ88_SRCS} ${FemSolverFenics_SRCS} + ${FemSolverZ88_SRCS} ${FemTests_SRCS} ${FemTestsFiles_SRCS} ${FemTestsCcx_SRCS} @@ -240,8 +240,8 @@ INSTALL(FILES ${FemSolver_SRCS} DESTINATION Mod/Fem/femsolver) INSTALL(FILES ${FemSolverCalculix_SRCS} DESTINATION Mod/Fem/femsolver/calculix) INSTALL(FILES ${FemSolverElmer_SRCS} DESTINATION Mod/Fem/femsolver/elmer) INSTALL(FILES ${FemSolverElmerEquations_SRCS} DESTINATION Mod/Fem/femsolver/elmer/equations) -INSTALL(FILES ${FemSolverZ88_SRCS} DESTINATION Mod/Fem/femsolver/z88) INSTALL(FILES ${FemSolverFenics_SRCS} DESTINATION Mod/Fem/femsolver/fenics) +INSTALL(FILES ${FemSolverZ88_SRCS} DESTINATION Mod/Fem/femsolver/z88) INSTALL(FILES ${FemTests_SRCS} DESTINATION Mod/Fem/femtest) INSTALL(FILES ${FemTestsFiles_SRCS} DESTINATION Mod/Fem/femtest/testfiles) INSTALL(FILES ${FemTestsCcx_SRCS} DESTINATION Mod/Fem/femtest/testfiles/ccx)