diff --git a/CMake/win64-libsVs2017Py3.cmake b/CMake/win64-libsVs2017Py3.cmake deleted file mode 100644 index 7d12ebd64eb08143d044886ff18cf6d30274cbf5..0000000000000000000000000000000000000000 --- a/CMake/win64-libsVs2017Py3.cmake +++ /dev/null @@ -1,17 +0,0 @@ -# This file is used when PFEM is compiled on Windows x64 -# with Luc Papeleux's precompiled libraries - -SET(CMAKE_INSTALL_PREFIX "../waves_INSTALL" CACHE PATH "" FORCE) - -STRING(REGEX REPLACE "\\\\" "/" MYLIBS $ENV{METAFORLIBS}) -SET(CMAKE_GENERATOR "Visual Studio 15 2017 Win64" CACHE INTERNAL "" FORCE) - -SET(PYTHON_INCLUDE_DIR "${MYLIBS}/Python/include" CACHE PATH "" FORCE) -SET(PYTHON_LIBRARY "${MYLIBS}/Python/Libs/python37.lib" CACHE FILEPATH "" FORCE) -SET(PYTHON_RELEASE_LIBRARY "${MYLIBS}/Python/Libs/python37.lib" CACHE FILEPATH "" FORCE) -SET(PYTHON_DEBUG_LIBRARY "${MYLIBS}/Python/Libs/python37_d.lib" CACHE FILEPATH "" FORCE) - - -# Disable Trilinos (we should test with Trilinos/clang) -LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) -INCLUDE(disable-trilinos) diff --git a/ext/amfe b/ext/amfe index e4ae874992b92b2fb683d96833b714ddebff149b..073c11cb6ea51f23f4f8a915f4aee534fd6c5817 160000 --- a/ext/amfe +++ b/ext/amfe @@ -1 +1 @@ -Subproject commit e4ae874992b92b2fb683d96833b714ddebff149b +Subproject commit 073c11cb6ea51f23f4f8a915f4aee534fd6c5817