From 43bf51da67541a538a69a3b4ab0a842418c7aa1b Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 3 Apr 2019 20:23:46 +0200 Subject: [PATCH] copy and paste error in installation target of FEM --- CMakeLists.txt | 12 ++++++------ src/CMakeLists.txt | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d23245f52..82335ee4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,9 +106,9 @@ set (CMAKE_C_COMPILER "${PETSC_MPICC}") # DAMASK solver defines project to build if (DAMASK_SOLVER STREQUAL "GRID") - project (DAMASK_spectral Fortran C) + project (DAMASK_grid Fortran C) add_definitions (-DGrid) - message ("Building Spectral Solver\n") + message ("Building Grid Solver\n") elseif (DAMASK_SOLVER STREQUAL "FEM") project (DAMASK_FEM Fortran C) add_definitions (-DFEM) @@ -489,11 +489,11 @@ add_subdirectory (src) # INSTALL BUILT BINARIES if (CMAKE_BUILD_TYPE STREQUAL "SYNTAXONLY") - exec_program (mktemp ARGS -d OUTPUT_VARIABLE BLACK_HOLE) - install (PROGRAMS ${PROJECT_BINARY_DIR}/src/prec.mod - DESTINATION ${BLACK_HOLE}) + exec_program (mktemp OUTPUT_VARIABLE nothing) + exec_program (mktemp ARGS -d OUTPUT_VARIABLE black_hole) + install (PROGRAMS ${nothing} DESTINATION ${black_hole}) else () - if (PROJECT_NAME STREQUAL "DAMASK_spectral") + if (PROJECT_NAME STREQUAL "DAMASK_grid") install (PROGRAMS ${PROJECT_BINARY_DIR}/src/DAMASK_spectral DESTINATION ${CMAKE_INSTALL_PREFIX}) elseif (PROJECT_NAME STREQUAL "DAMASK_FEM") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 372540fc3..274069226 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,7 +14,7 @@ list(FILTER sources EXCLUDE REGEX ".*mesh_abaqus.*\\.f90") list(FILTER sources EXCLUDE REGEX ".*commercialFEM_fileList.*\\.f90") -if (PROJECT_NAME STREQUAL "DAMASK_spectral") +if (PROJECT_NAME STREQUAL "DAMASK_grid") # probably we should have subfolders for FEM and spectral list(FILTER sources EXCLUDE REGEX ".*DAMASK_FEM.*\\.f90") @@ -41,6 +41,6 @@ elseif (PROJECT_NAME STREQUAL "DAMASK_FEM") list(FILTER sources EXCLUDE REGEX ".*spectral_utilities.*\\.f90") list(FILTER sources EXCLUDE REGEX ".*mesh_grid.*\\.f90") - add_executable(DAMASK_spectral ${sources}) + add_executable(DAMASK_FEM ${sources}) endif()