From 47507de276c2cac6a6febc2179d734539ae2bdb2 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Sat, 22 May 2021 16:26:36 -0400 Subject: [PATCH] libn2p2 uses M_PI which is non-standard and thus requires -std=gnu++11 with newer MinGW --- cmake/Modules/Packages/USER-HDNNP.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/Modules/Packages/USER-HDNNP.cmake b/cmake/Modules/Packages/USER-HDNNP.cmake index d5e3f97ab2..523aa6d543 100644 --- a/cmake/Modules/Packages/USER-HDNNP.cmake +++ b/cmake/Modules/Packages/USER-HDNNP.cmake @@ -21,7 +21,7 @@ if(DOWNLOAD_N2P2) set(N2P2_CXX_STD "-std=c++11") elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") set(N2P2_COMP gnu) - set(N2P2_CXX_STD "-std=c++11") + set(N2P2_CXX_STD "-std=gnu++11") elseif(CMAKE_CXX_COMPILER_ID STREQUAL "PGI") set(N2P2_COMP gnu) set(N2P2_CXX_STD "--c++11") @@ -94,6 +94,9 @@ if(DOWNLOAD_N2P2) if(BUILD_MPI) set_target_properties(LAMMPS::N2P2::LIBNNPIF PROPERTIES INTERFACE_LINK_LIBRARIES MPI::MPI_CXX) + if((CMAKE_SYSTEM_NAME STREQUAL Windows) AND CMAKE_CROSSCOMPILING) + add_dependencies(LAMMPS::N2P2::LIBNNPIF MPI::MPI_CXX) + endif() endif() # final step to define imported target