From 8319e67b286bccaf2b094059437259eb87854100 Mon Sep 17 00:00:00 2001
From: Christophe Picard <christophe.picard@univ-grenoble-alpes.fr>
Date: Thu, 10 May 2018 15:17:40 +0200
Subject: [PATCH] Modify order of python packages
---
CMakeLists.txt | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a4693947..cdbcc7497 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -143,13 +143,13 @@ find_python_module(gmpy2 REQUIRED)
find_python_module(subprocess32 REQUIRED)
find_python_module(editdistance REQUIRED)
find_python_module(portalocker REQUIRED)
-find_python_module(colors REQUIRED) # color.py package
+find_python_module(colors REQUIRED) # ansicolor package
find_python_module(tee REQUIRED)
find_python_module(primefac REQUIRED)
find_python_module(graph_tool REQUIRED)
find_python_module(pyopencl REQUIRED)
-find_python_module(gpyfft REQUIRED)
find_python_module(backports.weakref REQUIRED)
+find_python_module(gpyfft REQUIRED)
find_python_module(argparse_color_formatter REQUIRED)
# --- MPI ---
if(USE_MPI)
@@ -191,12 +191,12 @@ if(WITH_FFTW)
set(FIND_FFTW_VERBOSE OFF)
set(FIND_FFTW_DEBUG OFF)
set(FIND_FFTW_SHARED_ONLY ON)
- compile_with(FFTW
+ compile_with(FFTW
REQUIRED COMPONENTS Fftw3f Fftw3d
Fftw3f-mpi Fftw3d-mpi
- OPTIONAL_COMPONENTS
- Fftw3f-threads Fftw3d-threads
- Fftw3l Fftw3l-mpi Fftw3l-threads
+ OPTIONAL_COMPONENTS
+ Fftw3f-threads Fftw3d-threads
+ Fftw3l Fftw3l-mpi Fftw3l-threads
Fftw3q Fftw3q-threads)
set(dirlist)
@@ -344,7 +344,7 @@ if(USE_FORTRAN)
# Path to fortran-related generated files (.pyf, precision ...)
set(GENERATED_FORTRAN_FILES_DIR ${CMAKE_BINARY_DIR}/generated_fortran/)
-
+
# --- copy sort_f90 file to build ---
# Required for setup.py to handle fortran files dependencies
configure_file(${CMAKE_SOURCE_DIR}/sort_f90.py ${CMAKE_BINARY_DIR}/sort_f90.py)
@@ -378,7 +378,7 @@ if(USE_FORTRAN)
# Add compilation flags:
#append_Fortran_FLAGS("-Wall -fPIC -ffree-line-length-none -DBLOCKING_SEND_PLUS -DBLOCKING_SEND")
append_Fortran_FLAGS("-Wall -fPIC -ffree-line-length-none -cpp")
-
+
if(USE_MPI)
# -I
include_directories(${MPI_Fortran_INCLUDE_PATH})
@@ -465,12 +465,12 @@ endif()
# Hysop C++ library is generated in setup.py by swig
# --- C++ main and tests ---
if(USE_CXX)
-
+
get_filename_component(CXX_DIR "${CMAKE_SOURCE_DIR}/src/hysop++" ABSOLUTE)
get_filename_component(CXX_MAIN_DIR "${CXX_DIR}/main" ABSOLUTE)
get_filename_component(CXX_TEST_DIR "${CXX_DIR}/tests" ABSOLUTE)
get_filename_component(CXX_SOURCE_DIR "${CXX_DIR}/src" ABSOLUTE)
-
+
include_directories(${CXX_SOURCE_DIR})
include_directories(SYSTEM ${CXX_EXT_INCLUDES})
link_directories(${CXX_EXT_LIB_DIRS})
@@ -497,7 +497,7 @@ if(USE_CXX)
set(HYSOP_CXX_LIBRARY_DEP cpp2hysop_bundle)
endif()
endif()
-
+
if(WITH_MAIN_CXX)
list(APPEND cxx_executable_sources "${CXX_MAIN_DIR}/planner.cpp")
list(APPEND cxx_executable_sources "${CXX_MAIN_DIR}/diffSolver.cpp")
@@ -536,7 +536,7 @@ endif()
# when building, don't use the install RPATH already
# (but later on when installing)
-set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PACKAGE_NAME}")
# add the automatically determined parts of the RPATH
@@ -599,7 +599,7 @@ endif(WITH_TESTS)
if(WITH_DOCUMENTATION)
add_subdirectory(docs)
endif()
-
+
# ============= Summary =============
if(VERBOSE_MODE)
message("\n====================== End of configuration process ======================")
@@ -618,7 +618,7 @@ if(VERBOSE_MODE)
if(USE_CXX)
message(STATUS " CXX compiler : ${CMAKE_CXX_COMPILER}")
else()
- message(WARNING "You deactivate c++ to python interface generation. This will disable the Aitken-Schwarz Poisson solver.")
+ message(WARNING "You deactivate c++ to python interface generation. This will disable the Aitken-Schwarz Poisson solver.")
endif()
message(STATUS " Sources are in : ${CMAKE_SOURCE_DIR}")
message(STATUS " Project uses MPI : ${USE_MPI}")
@@ -632,7 +632,7 @@ if(VERBOSE_MODE)
message(STATUS " Default real numbers precision : double.")
else()
message(STATUS " Default real numbers precision : simple.")
- endif()
+ endif()
message(STATUS "====================== ======= ======================")
message(STATUS " ")
message(STATUS "Try :")
--
GitLab