From e51bb9273cae83423070b632420362e356397542 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franck=20P=C3=A9rignon?= <franck.perignon@imag.fr>
Date: Fri, 15 Apr 2016 09:19:25 +0200
Subject: [PATCH] Renaming to fix bug prone lower/uppercase mix on macos
---
HySoP/CMake | 1 -
HySoP/CMakeLists.txt | 2 +-
HySoP/DoxyConf/mainpage.doxygen | 5 +++--
{CMake => HySoP/cmake}/FindFFTW.cmake | 0
{CMake => HySoP/cmake}/FindPythonFull.cmake | 0
{CMake => HySoP/cmake}/FindPythonModule.cmake | 0
{CMake => HySoP/cmake}/FindSWIG.cmake | 0
{CMake => HySoP/cmake}/GoogleTestHelper.cmake | 0
{CMake => HySoP/cmake}/HySoPInstallSetup.cmake | 0
{CMake => HySoP/cmake}/HySoPTests.cmake | 0
{CMake => HySoP/cmake}/HysopVersion.cmake | 0
{CMake => HySoP/cmake}/LibFindMacros.cmake | 0
{CMake => HySoP/cmake}/MyTools.cmake | 0
{CMake => HySoP/cmake}/OutOfSourceBuild.cmake | 0
{CMake => HySoP/cmake}/PythonInstallSetup.cmake | 0
{CMake => HySoP/cmake}/cmake_uninstall.cmake.in | 0
{CMake => HySoP/cmake}/explore_python_config.py | 0
{CMake => HySoP/cmake}/fake/__init__.py | 0
{CMake => HySoP/cmake}/fake/setup.py | 0
{CMake => HySoP/cmake}/find_python_install.py | 0
{CMake => HySoP/cmake}/fortran_utils.cmake | 0
HySoP/src/hysop++/tests/CMakeLists.txt | 2 +-
22 files changed, 5 insertions(+), 5 deletions(-)
delete mode 120000 HySoP/CMake
rename {CMake => HySoP/cmake}/FindFFTW.cmake (100%)
rename {CMake => HySoP/cmake}/FindPythonFull.cmake (100%)
rename {CMake => HySoP/cmake}/FindPythonModule.cmake (100%)
rename {CMake => HySoP/cmake}/FindSWIG.cmake (100%)
rename {CMake => HySoP/cmake}/GoogleTestHelper.cmake (100%)
rename {CMake => HySoP/cmake}/HySoPInstallSetup.cmake (100%)
rename {CMake => HySoP/cmake}/HySoPTests.cmake (100%)
rename {CMake => HySoP/cmake}/HysopVersion.cmake (100%)
rename {CMake => HySoP/cmake}/LibFindMacros.cmake (100%)
rename {CMake => HySoP/cmake}/MyTools.cmake (100%)
rename {CMake => HySoP/cmake}/OutOfSourceBuild.cmake (100%)
rename {CMake => HySoP/cmake}/PythonInstallSetup.cmake (100%)
rename {CMake => HySoP/cmake}/cmake_uninstall.cmake.in (100%)
rename {CMake => HySoP/cmake}/explore_python_config.py (100%)
rename {CMake => HySoP/cmake}/fake/__init__.py (100%)
rename {CMake => HySoP/cmake}/fake/setup.py (100%)
rename {CMake => HySoP/cmake}/find_python_install.py (100%)
rename {CMake => HySoP/cmake}/fortran_utils.cmake (100%)
diff --git a/HySoP/CMake b/HySoP/CMake
deleted file mode 120000
index 6126c5130..000000000
--- a/HySoP/CMake
+++ /dev/null
@@ -1 +0,0 @@
-../CMake/
\ No newline at end of file
diff --git a/HySoP/CMakeLists.txt b/HySoP/CMakeLists.txt
index 709016523..a2aa26daa 100755
--- a/HySoP/CMakeLists.txt
+++ b/HySoP/CMakeLists.txt
@@ -21,7 +21,7 @@ if(POLICY CMP0053)
endif()
# Set cmake modules directory (i.e. the one which contains all user-defined FindXXX.cmake files among other things)
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
# Force out-of-source build
include(OutOfSourceBuild)
# Some usefull macros
diff --git a/HySoP/DoxyConf/mainpage.doxygen b/HySoP/DoxyConf/mainpage.doxygen
index fa8352f1f..c267d5085 100644
--- a/HySoP/DoxyConf/mainpage.doxygen
+++ b/HySoP/DoxyConf/mainpage.doxygen
@@ -78,7 +78,7 @@ After install completed, new files are located as follows :
- python package in USER_BASE/lib/pythonX.Y/site-packages/hysop/
- library in USER_BASE/lib/pythonX.Y/site-packages/hysop/lib
- fortran modules in USER_BASE/lib/pythonX.Y/site-packages/hysop/include/Modules
- - CMake configuration files in USER_BASE/lib/pythonX.Y/site-packages/hysop/share/CMake
+ - CMake configuration files in USER_BASE/lib/pythonX.Y/site-packages/hysop/share/cmake
\subsubsection installDirConfigCustom Custom configuration
The other available setup is based on the Python 'Prefix scheme installation' : <a href="http://docs.python.org/2/install/#alternate-installation-unix-the-prefix-scheme">http://docs.python.org/2/install/#alternate-installation-unix-the-prefix-scheme</a>. You need to specify your prefix that replace the default USER_BASE. This prefix is passed to cmake through the variable PREFIX.
@@ -91,7 +91,8 @@ After install completed, new files are located as follows :
- python package in PREFIX/lib/pythonX.Y/site-packages/hysop/
- library in PREFIX/lib/pythonX.Y/site-packages/hysop/lib
- fortran modules in PREFIX/lib/pythonX.Y/site-packages/hysop/include/Modules
- - CMake configuration files in PREFIX/lib/pythonX.Y/site-packages/hysop/share/CMake
+ - CMake configuration files in PREFIX/lib/pythonX.Y/site-packages/hysop/share/cmake
+
\subsection buildhysop Build
diff --git a/CMake/FindFFTW.cmake b/HySoP/cmake/FindFFTW.cmake
similarity index 100%
rename from CMake/FindFFTW.cmake
rename to HySoP/cmake/FindFFTW.cmake
diff --git a/CMake/FindPythonFull.cmake b/HySoP/cmake/FindPythonFull.cmake
similarity index 100%
rename from CMake/FindPythonFull.cmake
rename to HySoP/cmake/FindPythonFull.cmake
diff --git a/CMake/FindPythonModule.cmake b/HySoP/cmake/FindPythonModule.cmake
similarity index 100%
rename from CMake/FindPythonModule.cmake
rename to HySoP/cmake/FindPythonModule.cmake
diff --git a/CMake/FindSWIG.cmake b/HySoP/cmake/FindSWIG.cmake
similarity index 100%
rename from CMake/FindSWIG.cmake
rename to HySoP/cmake/FindSWIG.cmake
diff --git a/CMake/GoogleTestHelper.cmake b/HySoP/cmake/GoogleTestHelper.cmake
similarity index 100%
rename from CMake/GoogleTestHelper.cmake
rename to HySoP/cmake/GoogleTestHelper.cmake
diff --git a/CMake/HySoPInstallSetup.cmake b/HySoP/cmake/HySoPInstallSetup.cmake
similarity index 100%
rename from CMake/HySoPInstallSetup.cmake
rename to HySoP/cmake/HySoPInstallSetup.cmake
diff --git a/CMake/HySoPTests.cmake b/HySoP/cmake/HySoPTests.cmake
similarity index 100%
rename from CMake/HySoPTests.cmake
rename to HySoP/cmake/HySoPTests.cmake
diff --git a/CMake/HysopVersion.cmake b/HySoP/cmake/HysopVersion.cmake
similarity index 100%
rename from CMake/HysopVersion.cmake
rename to HySoP/cmake/HysopVersion.cmake
diff --git a/CMake/LibFindMacros.cmake b/HySoP/cmake/LibFindMacros.cmake
similarity index 100%
rename from CMake/LibFindMacros.cmake
rename to HySoP/cmake/LibFindMacros.cmake
diff --git a/CMake/MyTools.cmake b/HySoP/cmake/MyTools.cmake
similarity index 100%
rename from CMake/MyTools.cmake
rename to HySoP/cmake/MyTools.cmake
diff --git a/CMake/OutOfSourceBuild.cmake b/HySoP/cmake/OutOfSourceBuild.cmake
similarity index 100%
rename from CMake/OutOfSourceBuild.cmake
rename to HySoP/cmake/OutOfSourceBuild.cmake
diff --git a/CMake/PythonInstallSetup.cmake b/HySoP/cmake/PythonInstallSetup.cmake
similarity index 100%
rename from CMake/PythonInstallSetup.cmake
rename to HySoP/cmake/PythonInstallSetup.cmake
diff --git a/CMake/cmake_uninstall.cmake.in b/HySoP/cmake/cmake_uninstall.cmake.in
similarity index 100%
rename from CMake/cmake_uninstall.cmake.in
rename to HySoP/cmake/cmake_uninstall.cmake.in
diff --git a/CMake/explore_python_config.py b/HySoP/cmake/explore_python_config.py
similarity index 100%
rename from CMake/explore_python_config.py
rename to HySoP/cmake/explore_python_config.py
diff --git a/CMake/fake/__init__.py b/HySoP/cmake/fake/__init__.py
similarity index 100%
rename from CMake/fake/__init__.py
rename to HySoP/cmake/fake/__init__.py
diff --git a/CMake/fake/setup.py b/HySoP/cmake/fake/setup.py
similarity index 100%
rename from CMake/fake/setup.py
rename to HySoP/cmake/fake/setup.py
diff --git a/CMake/find_python_install.py b/HySoP/cmake/find_python_install.py
similarity index 100%
rename from CMake/find_python_install.py
rename to HySoP/cmake/find_python_install.py
diff --git a/CMake/fortran_utils.cmake b/HySoP/cmake/fortran_utils.cmake
similarity index 100%
rename from CMake/fortran_utils.cmake
rename to HySoP/cmake/fortran_utils.cmake
diff --git a/HySoP/src/hysop++/tests/CMakeLists.txt b/HySoP/src/hysop++/tests/CMakeLists.txt
index e16d2d63c..30668e041 100644
--- a/HySoP/src/hysop++/tests/CMakeLists.txt
+++ b/HySoP/src/hysop++/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
-include("${CMAKE_SOURCE_DIR}/CMake/GoogleTestHelper.cmake")
+include("${CMAKE_SOURCE_DIR}/cmake/GoogleTestHelper.cmake")
add_subdirectory("testPolynoms")
add_subdirectory("testPlanner")
--
GitLab