From df0971f6da28306fa78a1ea863bb038e5f0c51f8 Mon Sep 17 00:00:00 2001
From: Romain Boman <romain.boman@gmail.com>
Date: Wed, 23 Mar 2022 16:47:03 +0100
Subject: [PATCH] clean .cmake files
---
CMake/debian-intel.cmake | 21 ---------------------
CMake/debian.cmake | 20 --------------------
CMake/fabulous.cmake | 3 ---
CMake/gaston-clang-Py3.cmake | 21 ---------------------
CMake/{OSX.cmake => maclam.cmake} | 0
CMake/win64-libsVs2017Py3.cmake | 9 ++++-----
6 files changed, 4 insertions(+), 70 deletions(-)
delete mode 100644 CMake/debian-intel.cmake
delete mode 100644 CMake/debian.cmake
delete mode 100644 CMake/gaston-clang-Py3.cmake
rename CMake/{OSX.cmake => maclam.cmake} (100%)
diff --git a/CMake/debian-intel.cmake b/CMake/debian-intel.cmake
deleted file mode 100644
index dfcef675..00000000
--- a/CMake/debian-intel.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2022 University of Liège
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-SET(CMAKE_CXX_COMPILER "icpc" CACHE FILEPATH "" FORCE)
-SET(CMAKE_C_COMPILER "icc" CACHE FILEPATH "" FORCE)
-
-SET(MKL_LIB_PATH "/opt/intel/composerxe/mkl/lib/intel64;/opt/intel/composerxe/lib/intel64" CACHE PATH "" FORCE)
-SET(MKL_INCLUDE_PATH "/opt/intel/composerxe/mkl/include" CACHE PATH "" FORCE)
-
diff --git a/CMake/debian.cmake b/CMake/debian.cmake
deleted file mode 100644
index 771da7d1..00000000
--- a/CMake/debian.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2022 University of Liège
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-SET(CMAKE_CXX_COMPILER "icpc" CACHE FILEPATH "" FORCE)
-SET(CMAKE_C_COMPILER "icc" CACHE FILEPATH "" FORCE)
-
-SET(MKL_LIB_PATH "/opt/intel/composerxe/mkl/lib/intel64;/opt/intel/composerxe/lib/intel64" CACHE PATH "" FORCE)
-SET(MKL_INCLUDE_PATH "/opt/intel/composerxe/mkl/include" CACHE PATH "" FORCE)
diff --git a/CMake/fabulous.cmake b/CMake/fabulous.cmake
index 97025860..77b1fbaa 100644
--- a/CMake/fabulous.cmake
+++ b/CMake/fabulous.cmake
@@ -14,6 +14,3 @@
FIND_PROGRAM(CMAKE_CXX_COMPILER NAMES icpc)
FIND_PROGRAM(CMAKE_C_COMPILER NAMES icc)
-
-#SET(CMAKE_BUILD_TYPE "Debug" CACHE FILEPATH "" FORCE)
-
diff --git a/CMake/gaston-clang-Py3.cmake b/CMake/gaston-clang-Py3.cmake
deleted file mode 100644
index f87dee6b..00000000
--- a/CMake/gaston-clang-Py3.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2022 University of Liège
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FIND_PROGRAM(CMAKE_CXX_COMPILER NAMES clang++)
-FIND_PROGRAM(CMAKE_C_COMPILER NAMES clang)
-# vtk for py3
-SET(VTK_DIR "/opt/vtk/lib/cmake/vtk-7.1" CACHE PATH "" FORCE)
-# Trilinos not compiling with clang (check to wiki to fix)
-LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
-INCLUDE(disable-trilinos)
diff --git a/CMake/OSX.cmake b/CMake/maclam.cmake
similarity index 100%
rename from CMake/OSX.cmake
rename to CMake/maclam.cmake
diff --git a/CMake/win64-libsVs2017Py3.cmake b/CMake/win64-libsVs2017Py3.cmake
index dd67bf30..7d12ebd6 100644
--- a/CMake/win64-libsVs2017Py3.cmake
+++ b/CMake/win64-libsVs2017Py3.cmake
@@ -1,16 +1,15 @@
# 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)
+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)
--
GitLab