update .cmake files

CMake/OSX.cmake

@@ -14,5 +14,5 @@
 
 # Disable Trilinos (we should test with Trilinos/clang)
 LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
-INCLUDE(disable-trilinos)
 
+SET(Python3_ROOT_DIR "/Library/Frameworks/Python.framework/Versions/3.7" CACHE PATH "" FORCE)

CMake/codeblocks.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_GENERATOR "CodeBlocks - Unix Makefiles" CACHE INTERNAL "" FORCE)
-
-SET(MKL_LIB_PATH      "/opt/intel/mkl/lib/intel64;/opt/intel/lib/intel64" CACHE PATH "" FORCE)
-SET(MKL_INCLUDE_PATH  "/opt/intel/mkl/include"                            CACHE PATH "" FORCE)
-

CMake/gaston-clang-Py3.cmake

@@ -16,6 +16,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)
-# Trilinos not compiling with clang (check to wiki to fix)
-LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
-INCLUDE(disable-trilinos)

CMake/spring.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)
-
-# force to look for mkl
-SET(BLA_VENDOR "Intel10_64lp" CACHE STRING "" FORCE)
-
-# Trilinos not available on spring
-LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
-INCLUDE(disable-trilinos)
-

CMake/win64-libsVs2017Py3.cmake

@@ -11,8 +11,3 @@ SET(PYTHON_INCLUDE_DIR              "${MYLIBS}/Python/include"             CACHE
 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)