cleaning among .cmake files

CMake/debian-intel.cmake

-# 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)
-

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)

CMake/ubuntu.cmake

-# 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)
-

CMake/gaston-clang-Py3.cmake → 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)

CMake/debian.cmake → 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)

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)