From 638aa8f0b7c25eada7b481e657dce4388fd93773 Mon Sep 17 00:00:00 2001
From: Incardona Pietro <incardon@mpi-cbg.de>
Date: Thu, 18 Nov 2021 01:27:19 +0100
Subject: [PATCH] Fixing CMAKE unsupported operations
---
CMakeLists.txt | 28 +++++-----------------------
1 file changed, 5 insertions(+), 23 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 827dc37b9..49515395e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -164,25 +164,6 @@ if (OPENMP_FOUND)
set(DEFINE_HAVE_OPENMP "#define HAVE_OPENMP")
endif()
-macro(getAllLinkedLibraries iTarget iReturnValue)
- if(NOT TARGET ${iTarget})
- message(WARNING "${iTarget} is not a target")
- else()
- get_target_property(path ${iTarget} LOCATION)
- if(NOT ${path} IN_LIST ${iReturnValue})
- if (NOT ${path} STREQUAL "path-NOTFOUND")
- list(APPEND ${iReturnValue} ${path})
- endif()
- endif()
- get_target_property(linkedLibrairies ${iTarget} INTERFACE_LINK_LIBRARIES)
- if(NOT "${linkedLibrairies}" STREQUAL "")
- FOREACH(linkedLibrary ${linkedLibrairies})
- getAllLinkedLibraries(${linkedLibrary} ${iReturnValue})
- ENDFOREACH()
- endif()
- endif()
-endmacro()
-
if(MPI_FOUND)
get_filename_component(OPENFPM_MPI_DEP "${MPI_C_INCLUDE_DIRS}" DIRECTORY)
file(READ ${CMAKE_SOURCE_DIR}/src/cmake/openfpmConfig-configure.cmake CMAKE_OPENFPM_CONFIG_VARS)
@@ -199,10 +180,11 @@ if (Boost_FOUND)
message( FATAL_ERROR "BOOST is invalid reinstalling" )
endif()
# Get the library names
- getAllLinkedLibraries(Boost::context OPENFPM_CONTEXT_LIBS)
- getAllLinkedLibraries(Boost::fiber OPENFPM_CONTEXT_LIBS)
- string (REPLACE ";" " " OPENFPM_CONTEXT_LIBS "${OPENFPM_CONTEXT_LIBS}")
- file(WRITE optional_boost_libs "${OPENFPM_CONTEXT_LIBS}")
+ if (Boost_context_FOUND AND Boost_fiber_FOUND)
+ file(WRITE optional_boost_libs "-L${BOOST_ROOT}/lib -lboost_context -lboost_fiber")
+ else()
+ file(WRITE optional_boost_libs " ")
+ endif()
else()
file(WRITE error_code "202")
message( FATAL_ERROR "BOOST is required in order to install OpenFPM" )
--
GitLab