From b068a9d859c9365d08703bc0a69bc42a40e2f09c Mon Sep 17 00:00:00 2001
From: Sam Yates <yates@cscs.ch>
Date: Tue, 10 Jul 2018 14:44:46 +0200
Subject: [PATCH] Do not build/use local modcc if ARB_MODCC set (#527)
Fixes #526.
---
mechanisms/CMakeLists.txt | 6 ++++++
modcc/CMakeLists.txt | 4 +++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/mechanisms/CMakeLists.txt b/mechanisms/CMakeLists.txt
index 3932382e..2ad38b11 100644
--- a/mechanisms/CMakeLists.txt
+++ b/mechanisms/CMakeLists.txt
@@ -18,10 +18,16 @@ if(ARB_WITH_PROFILING)
list(APPEND modcc_flags "--profile")
endif()
+set(external_modcc)
+if(ARB_WITH_EXTERNAL_MODCC)
+ set(external_modcc MODCC ${modcc})
+endif()
+
build_modules(
${mechanisms}
SOURCE_DIR "${mod_srcdir}"
DEST_DIR "${mech_dir}"
+ ${external_modcc}
MODCC_FLAGS -t cpu -t gpu ${modcc_flags}
GENERATES .hpp _cpu.cpp _gpu.cpp _gpu.cu
TARGET build_all_mods
diff --git a/modcc/CMakeLists.txt b/modcc/CMakeLists.txt
index 85b55cf9..23c0f924 100644
--- a/modcc/CMakeLists.txt
+++ b/modcc/CMakeLists.txt
@@ -35,5 +35,7 @@ target_link_libraries(modcc libmodcc ext-tclap)
set_target_properties(modcc libmodcc PROPERTIES EXCLUDE_FROM_ALL ${ARB_WITH_EXTERNAL_MODCC})
-install(TARGETS modcc RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+if (NOT ARB_WITH_EXTERNAL_MODCC)
+ install(TARGETS modcc RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
--
GitLab