From 40514e2a4c176e8bf5fb6bb21e5960469bc0eb4d Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu, 21 Jun 2018 13:47:50 +0200
Subject: [PATCH] Make cmake include starpu_simgrid_wrap.h only after tests
Because it #define main and thus makes link tests fail.
---
CMakeLists.txt | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index edb3035b0..fa18b30b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -612,9 +612,6 @@ if( CHAMELEON_SCHED_STARPU )
list(INSERT CHAMELEON_DEP 0 ${STARPU_LIBRARIES_DEP})
set(CMAKE_REQUIRED_LIBRARIES "${STARPU_LIBRARIES_DEP}")
endif()
- if (CHAMELEON_SIMULATION)
- list(APPEND CMAKE_REQUIRED_FLAGS "-include" "starpu_simgrid_wrap.h")
- endif()
string(REPLACE ";" " " CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}")
check_function_exists(starpu_data_idle_prefetch_on_node HAVE_STARPU_IDLE_PREFETCH)
if ( HAVE_STARPU_IDLE_PREFETCH )
@@ -1007,6 +1004,19 @@ if(CHAMELEON_ENABLE_DOC)
endif()
#------------------------------------------------------------------------------
+
+###############################################################################
+# Make cmake include starpu_simgrid_wrap.h (which #define main and thus makes #
+# link tests fail) only after tests. #
+###############################################################################
+if( CHAMELEON_SCHED_STARPU )
+ if ( STARPU_FOUND )
+ if (CHAMELEON_SIMULATION)
+ list(APPEND CMAKE_REQUIRED_FLAGS "-include" "starpu_simgrid_wrap.h")
+ endif()
+ endif()
+endif()
+
###############################################################################
# Config files (pkg_config) #
#############################
--
GitLab