Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove DBCSR_OPT option in cmake #93

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Remove DBCSR_OPT option in cmake #93

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ddef268
cmake: fix DBCSR_OPT option
junghans Nov 1, 2018
8422b5c
cmake: remove DBCSR_OPT as cp2k detection is broken
junghans Nov 1, 2018
45f6a6e
Merge branch 'master' into cmake_fix
cnegre Dec 12, 2018
5b0ba75
Merge branch 'master' into cmake_fix
cnegre Apr 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ if(PROGRESS)
find_package(PROGRESS REQUIRED)
endif()

option(DBCSR_OPT "Whether to use DBCSR" OFF)
#option(DBCSR_OPT "Whether to use DBCSR" OFF)

option(GPUOPT "Whether to use the GPU" OFF)
if(GPUOPT)
Expand Down Expand Up @@ -118,18 +118,20 @@ wrtrestartlib.f90 deorthomyrhoprogress.f90 orthomyHprogress.f90 readrestartlib.f
readppotspline.f90 pairpotspline.f90 errors.f90 initcoulombklist.f90
flcnnono.f90 flcnnono_sp.f90 kflcnnono.f90 dosfittab.f90)

#if(NOT DBCSR_OPT)
# set(DBCSR)
#else()
# set(DBCSR dbcsr_var_mod.f90 init_dbcsr.f90 shutdown_dbcsr.f90)
#endif()

foreach(_m MYMODULES MYSUBS DBCSR)
set(${_m}_SOURCES)
foreach(_file ${${_m}})
list(APPEND ${_m}_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../src/${_file})
endforeach()
endforeach()

if(NOT DBCSR_OPT)
set(DBCSR_SOURCES)
endif()

add_library(latte ${MYMODULES_SOURCES} ${MYSUBS_SOURCES}
add_library(latte ${MYMODULES_SOURCES} ${MYSUBS_SOURCES} ${DBCSR_SOURCES}
${CMAKE_CURRENT_SOURCE_DIR}/../src/latte_lib.f90
${CMAKE_CURRENT_SOURCE_DIR}/../src/latte_c_bind.f90
)
Expand Down