Unverified Commit 3bd52934 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

cross-compilation improvements

parent 5fbb1fa3

cmake/CMakeLists.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -255,8 +255,8 @@ if(PKG_MSCG OR PKG_USER-ATC OR PKG_USER-AWPMD OR PKG_USER-QUIP OR PKG_LATTE) 
    enable_language(Fortran)

    enable_language(Fortran)

    file(GLOB LAPACK_SOURCES ${LAMMPS_LIB_SOURCE_DIR}/linalg/[^.]*.[fF])

    file(GLOB LAPACK_SOURCES ${LAMMPS_LIB_SOURCE_DIR}/linalg/[^.]*.[fF])

    add_library(linalg STATIC ${LAPACK_SOURCES})

    add_library(linalg STATIC ${LAPACK_SOURCES})

    set(BLAS_LIBRARIES linalg)

    set(BLAS_LIBRARIES "${CMAKE_BINARY_DIR}/liblinalg.a")

    set(LAPACK_LIBRARIES linalg)

    set(LAPACK_LIBRARIES "${CMAKE_BINARY_DIR}/liblinalg.a")

  else()

  else()

    list(APPEND LAPACK_LIBRARIES ${BLAS_LIBRARIES})

    list(APPEND LAPACK_LIBRARIES ${BLAS_LIBRARIES})

  endif()

  endif()

cmake/Modules/Packages/KIM.cmake

+1 −0
Original line number Original line Diff line number Diff line
@@ -49,6 +49,7 @@ if(PKG_KIM) 
                 -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>

                 -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>

                 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}

                 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}

                 -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}

                 -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}

                 -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}

      BUILD_BYPRODUCTS <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libkim-api${CMAKE_SHARED_LIBRARY_SUFFIX} 

      BUILD_BYPRODUCTS <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libkim-api${CMAKE_SHARED_LIBRARY_SUFFIX} 

      )

      )

    ExternalProject_get_property(kim_build INSTALL_DIR)

    ExternalProject_get_property(kim_build INSTALL_DIR)

cmake/Modules/Packages/MSCG.cmake

+1 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ if(PKG_MSCG) 
                 -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>

                 -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>

                 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}

                 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}

                 -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}

                 -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}

                 -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}

      BUILD_COMMAND ${CMAKE_COMMAND} --build . --target mscg

      BUILD_COMMAND ${CMAKE_COMMAND} --build . --target mscg

      INSTALL_COMMAND ""

      INSTALL_COMMAND ""

      BUILD_BYPRODUCTS <BINARY_DIR>/libmscg.a

      BUILD_BYPRODUCTS <BINARY_DIR>/libmscg.a

cmake/presets/mingw-cross.cmake

+9 −7
Original line number Original line Diff line number Diff line 
set(WIN_PACKAGES ASPHERE BODY CLASS2 COLLOID COMPRESS CORESHELL DIPOLE GPU

set(WIN_PACKAGES ASPHERE BODY CLASS2 COLLOID COMPRESS CORESHELL DIPOLE GPU

                 GRANULAR KSPACE MANYBODY MC MISC MOLECULE OPT PERI POEMS QEQ

                 GRANULAR KSPACE LATTE MANYBODY MC MISC MOLECULE OPT PERI

                 REPLICA RIGID SHOCK SNAP SPIN SRD VORONOI USER-ATC USER-AWPMD

                 POEMS QEQ REPLICA RIGID SHOCK SNAP SPIN SRD VORONOI

                 USER-BOCS USER-CGDNA USER-CGSDK USER-COLVARS USER-DIFFRACTION

                 USER-ATC USER-AWPMD USER-BOCS USER-CGDNA USER-CGSDK

                 USER-DPD USER-DRUDE USER-EFF USER-FEP USER-INTEL USER-MANIFOLD

                 USER-COLVARS USER-DIFFRACTION USER-DPD USER-DRUDE USER-EFF

                 USER-MEAMC USER-MESO USER-MISC USER-MGPT USER-MOFFF USER-MOLFILE

                 USER-FEP USER-INTEL USER-MANIFOLD USER-MEAMC USER-MESO

                 USER-OMP USER-PHONON USER-PTM USER-QTB USER-REACTION USER-REAXC

                 USER-MISC USER-MGPT USER-MOFFF USER-MOLFILE USER-OMP

                 USER-SDPD USER-SMD USER-SMTBQ USER-SPH USER-TALLY USER-UEF USER-YAFF)

                 USER-PHONON USER-PTM USER-QTB USER-REACTION USER-REAXC

                 USER-SDPD USER-SMD USER-SMTBQ USER-SPH USER-TALLY USER-UEF

                 USER-YAFF)





foreach(PKG ${WIN_PACKAGES})

foreach(PKG ${WIN_PACKAGES})

  set(PKG_${PKG} ON CACHE BOOL "" FORCE)

  set(PKG_${PKG} ON CACHE BOOL "" FORCE)

CRA Git | Maintained and supported by SUSTech CRA and CCSE