ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USER_OMP -> USER-OMP

Browse Source
This commit is contained in:
Christoph Junghans
2017-07-16 20:19:20 -06:00
parent b6385d6ce2
commit d6f05ea309
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
cmake/CMakeLists.txt
View File

@ -52,7 +52,7 @@ foreach(PKG ${PACKAGES})
option(ENABLE_${PKG} "Build ${PKG} Package" ${ENABLE_ALL}) option(ENABLE_${PKG} "Build ${PKG} Package" ${ENABLE_ALL})
endforeach() endforeach()
set(ACCEL_PACKAGES USER_OMP KOKKOS OPT) set(ACCEL_PACKAGES USER-OMP KOKKOS OPT)
foreach(PKG ${ACCEL_PACKAGES}) foreach(PKG ${ACCEL_PACKAGES})
option(ENABLE_${PKG} "Build ${PKG} Package" OFF) option(ENABLE_${PKG} "Build ${PKG} Package" OFF)
endforeach() endforeach()
@ -220,7 +220,7 @@ if(ENABLE_KOKKOS OR ENABLE_MSCG)
set(CMAKE_CXX_EXTENSIONS OFF) #...without compiler extensions like gnu++11 set(CMAKE_CXX_EXTENSIONS OFF) #...without compiler extensions like gnu++11
endif() endif()
if(ENABLE_USER_OMP OR ENABLE_KOKKOS) if(ENABLE_USER-OMP OR ENABLE_KOKKOS)
find_package(OpenMP REQUIRED) find_package(OpenMP REQUIRED)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
@ -293,21 +293,21 @@ endif()
# e.g. accelerator packages # e.g. accelerator packages
###################################################################### ######################################################################
if(ENABLE_USER_OMP) if(ENABLE_USER-OMP)
set(USER_OMP_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/USER-OMP) set(USER-OMP_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/USER-OMP)
set(USER_OMP_SOURCES ${USER_OMP_SOURCES_DIR}/thr_data.cpp set(USER-OMP_SOURCES ${USER-OMP_SOURCES_DIR}/thr_data.cpp
${USER_OMP_SOURCES_DIR}/thr_omp.cpp ${USER-OMP_SOURCES_DIR}/thr_omp.cpp
${USER_OMP_SOURCES_DIR}/fix_nh_omp.cpp ${USER-OMP_SOURCES_DIR}/fix_nh_omp.cpp
${USER_OMP_SOURCES_DIR}/fix_nh_sphere_omp.cpp) ${USER-OMP_SOURCES_DIR}/fix_nh_sphere_omp.cpp)
set_property(GLOBAL PROPERTY "OMP_SOURCES" "${USER_OMP_SOURCES}") set_property(GLOBAL PROPERTY "OMP_SOURCES" "${USER-OMP_SOURCES}")
# detects styles which have USER-OMP version # detects styles which have USER-OMP version
RegisterStylesExt(${USER_OMP_SOURCES_DIR} omp OMP_SOURCES) RegisterStylesExt(${USER-OMP_SOURCES_DIR} omp OMP_SOURCES)
get_property(USER_OMP_SOURCES GLOBAL PROPERTY OMP_SOURCES) get_property(USER-OMP_SOURCES GLOBAL PROPERTY OMP_SOURCES)
list(APPEND LIB_SOURCES ${USER_OMP_SOURCES}) list(APPEND LIB_SOURCES ${USER-OMP_SOURCES})
include_directories(${USER_OMP_SOURCES_DIR}) include_directories(${USER-OMP_SOURCES_DIR})
endif() endif()
if(ENABLE_KOKKOS) if(ENABLE_KOKKOS)