Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 8fca5a58 authored by Olivier COULAUD's avatar Olivier COULAUD
Browse files

Remove bug with Cmake policy 004

parent 2f160e53
Branches
Tags
No related merge requests found
......@@ -4,7 +4,7 @@ if(CMAKE_MAJOR_VERSION GREATER 1 AND CMAKE_MINOR_VERSION GREATER 7 AND CMAKE_PAT
cmake_policy(SET CMP0022 OLD)
endif()
cmake_policy(SET CMP0004 OLD)
cmake_policy(SET CMP0004 NEW)
set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
......@@ -33,9 +33,9 @@ GetCpuInfos()
#===========================================================================
# SCALFMM version number. An even minor number corresponds to releases.
set(SCALFMM_MAJOR_VERSION 1)
set(SCALFMM_MINOR_VERSION 5)
set(SCALFMM_PATCH_VERSION 0)
set(SCALFMM_MAJOR_VERSION 2)
set(SCALFMM_MINOR_VERSION 0)
set(SCALFMM_PATCH_VERSION rc0)
set(SCALFMM_VERSION "${SCALFMM_MAJOR_VERSION}.${SCALFMM_MINOR_VERSION}.${SCALFMM_PATCH_VERSION}" )
set( MORSE_DISTRIB_DIR "" CACHE PATH "Directory of MORSE distribution")
......@@ -318,6 +318,7 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse/
set(SCALFMM_INCLUDES "${SCALFMM_INCLUDES}; ${MPI_CXX_INCLUDE_PATH}")
endif()
if (MPI_CXX_LINK_FLAGS)
string(REGEX REPLACE " " ";" MPI_CXX_LINK_FLAGS ${MPI_CXX_LINK_FLAGS} )
set(SCALFMM_LIBRARIES "${SCALFMM_LIBRARIES};${MPI_CXX_LINK_FLAGS}")
endif()
if (MPI_CXX_LIBRARIES)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment