From af19f7ab513ac3cb26b356b815abc71494a193a9 Mon Sep 17 00:00:00 2001
From: Romain Boman <romain.boman@gmail.com>
Date: Wed, 23 Mar 2022 16:35:28 +0100
Subject: [PATCH] cleaning among .cmake files
---
CMake/debian-intel.cmake | 21 -----------------
CMake/maclam.cmake | 4 ++--
CMake/ubuntu.cmake | 23 -------------------
...ang-Py3.cmake => use-clang-compiler.cmake} | 2 --
...{debian.cmake => use-intel-compiler.cmake} | 3 ---
CMake/win64-libsVs2017Py3.cmake | 10 ++++----
6 files changed, 6 insertions(+), 57 deletions(-)
delete mode 100644 CMake/debian-intel.cmake
delete mode 100644 CMake/ubuntu.cmake
rename CMake/{gaston-clang-Py3.cmake => use-clang-compiler.cmake} (89%)
rename CMake/{debian.cmake => use-intel-compiler.cmake} (74%)
diff --git a/CMake/debian-intel.cmake b/CMake/debian-intel.cmake
deleted file mode 100644
index cd2c1cc..0000000
--- a/CMake/debian-intel.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2020 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/maclam.cmake b/CMake/maclam.cmake
index 823f1ad..75c8f07 100644
--- a/CMake/maclam.cmake
+++ b/CMake/maclam.cmake
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Disable Trilinos (we should test with Trilinos/clang)
-LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+# "maclam" is the mac of R Boman
+# set custom python
SET(Python3_ROOT_DIR "/Library/Frameworks/Python.framework/Versions/3.7" CACHE PATH "" FORCE)
diff --git a/CMake/ubuntu.cmake b/CMake/ubuntu.cmake
deleted file mode 100644
index e6e3eea..0000000
--- a/CMake/ubuntu.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2020 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 icpc)
-#FIND_PROGRAM(CMAKE_C_COMPILER NAMES icc)
-
-#SET(CMAKE_BUILD_TYPE "Debug" CACHE FILEPATH "" FORCE)
-
-#SET(BLA_VENDOR "Intel10_64lp" CACHE STRING "" FORCE) # useless for cmake 3.5 (xenial)
-#SET(SWIG_EXECUTABLE "/home/boman/local/swig3/bin/swig" CACHE FILEPATH "" FORCE)
-
diff --git a/CMake/gaston-clang-Py3.cmake b/CMake/use-clang-compiler.cmake
similarity index 89%
rename from CMake/gaston-clang-Py3.cmake
rename to CMake/use-clang-compiler.cmake
index 250bcac..7b62c31 100644
--- a/CMake/gaston-clang-Py3.cmake
+++ b/CMake/use-clang-compiler.cmake
@@ -14,5 +14,3 @@
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)
diff --git a/CMake/debian.cmake b/CMake/use-intel-compiler.cmake
similarity index 74%
rename from CMake/debian.cmake
rename to CMake/use-intel-compiler.cmake
index 829861d..e7c05b0 100644
--- a/CMake/debian.cmake
+++ b/CMake/use-intel-compiler.cmake
@@ -15,6 +15,3 @@
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/win64-libsVs2017Py3.cmake b/CMake/win64-libsVs2017Py3.cmake
index b50f40d..54b68a2 100644
--- a/CMake/win64-libsVs2017Py3.cmake
+++ b/CMake/win64-libsVs2017Py3.cmake
@@ -2,12 +2,10 @@
# 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)
--
GitLab