Unverified Commit 0b951840 authored by Richard Berger's avatar Richard Berger Committed by GitHub
Browse files

Merge pull request #1103 from rbberger/cmake-fix-user-omp 

cmake: add missing fix_omp.h and fix_omp.cpp to compilation
parents 95c3d2fc ad498811

cmake/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -830,6 +830,7 @@ if(PKG_USER-OMP) 
    set(USER-OMP_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/USER-OMP)

    set(USER-OMP_SOURCES ${USER-OMP_SOURCES_DIR}/thr_data.cpp

                         ${USER-OMP_SOURCES_DIR}/thr_omp.cpp

                         ${USER-OMP_SOURCES_DIR}/fix_omp.cpp

                         ${USER-OMP_SOURCES_DIR}/fix_nh_omp.cpp

                         ${USER-OMP_SOURCES_DIR}/fix_nh_sphere_omp.cpp

                         ${USER-OMP_SOURCES_DIR}/domain_omp.cpp)
@@ -838,7 +839,7 @@ if(PKG_USER-OMP) 


    # detects styles which have USER-OMP version

    RegisterStylesExt(${USER-OMP_SOURCES_DIR} omp OMP_SOURCES)



    RegisterFixStyle("${USER-OMP_SOURCES_DIR}/fix_omp.h")



    get_property(USER-OMP_SOURCES GLOBAL PROPERTY OMP_SOURCES)

cmake/Modules/StyleHeaderUtils.cmake

+4 −0
Original line number Diff line number Diff line
@@ -85,6 +85,10 @@ function(RegisterNPairStyle path) 
    AddStyleHeader(${path} NPAIR)

endfunction(RegisterNPairStyle)



function(RegisterFixStyle path)

    AddStyleHeader(${path} FIX)

endfunction(RegisterFixStyle)



function(RegisterStyles search_path)

    FindStyleHeaders(${search_path} ANGLE_CLASS     angle_     ANGLE     ) # angle     ) # force

    FindStyleHeaders(${search_path} ATOM_CLASS      atom_vec_  ATOM_VEC  ) # atom      ) # atom      atom_vec_hybrid

CRA Git | Maintained and supported by SUSTech CRA and CCSE