From 0dd46afb4701f15f1f3e1cb022376d2511353562 Mon Sep 17 00:00:00 2001
From: Romain Boman <romain.boman@gmail.com>
Date: Wed, 23 Mar 2022 15:54:16 +0100
Subject: [PATCH] update .cmake files
---
CMake/OSX.cmake | 2 +-
CMake/codeblocks.cmake | 20 --------------------
CMake/gaston-clang-Py3.cmake | 3 ---
CMake/spring.cmake | 24 ------------------------
CMake/win64-libsVs2017Py3.cmake | 5 -----
5 files changed, 1 insertion(+), 53 deletions(-)
delete mode 100644 CMake/codeblocks.cmake
delete mode 100644 CMake/spring.cmake
diff --git a/CMake/OSX.cmake b/CMake/OSX.cmake
index 3fa586f..823f1ad 100644
--- a/CMake/OSX.cmake
+++ b/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)
diff --git a/CMake/codeblocks.cmake b/CMake/codeblocks.cmake
deleted file mode 100644
index 9462769..0000000
--- a/CMake/codeblocks.cmake
+++ /dev/null
@@ -1,20 +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_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)
-
diff --git a/CMake/gaston-clang-Py3.cmake b/CMake/gaston-clang-Py3.cmake
index 2dcb7c9..250bcac 100644
--- a/CMake/gaston-clang-Py3.cmake
+++ b/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)
diff --git a/CMake/spring.cmake b/CMake/spring.cmake
deleted file mode 100644
index 776f28b..0000000
--- a/CMake/spring.cmake
+++ /dev/null
@@ -1,24 +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)
-
-# 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)
-
diff --git a/CMake/win64-libsVs2017Py3.cmake b/CMake/win64-libsVs2017Py3.cmake
index dd67bf3..b50f40d 100644
--- a/CMake/win64-libsVs2017Py3.cmake
+++ b/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)
--
GitLab