From b58b8475caa5b6716cdc482b1444692a41391015 Mon Sep 17 00:00:00 2001
From: Markus Blatt <markus@dr-blatt.de>
Date: Mon, 27 Jan 2014 22:40:36 +0100
Subject: [PATCH] [cmake,release] Prevent searching twice for modules.
Before we tried to search for dune-common twice (once without a version
and then with the required version). Unfortunately this breaks because
we are adding the same library target twice. With this patch we only
search for a module once.
---
cmake/modules/DuneMacros.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/modules/DuneMacros.cmake b/cmake/modules/DuneMacros.cmake
index 27d24268c..3f8e77857 100644
--- a/cmake/modules/DuneMacros.cmake
+++ b/cmake/modules/DuneMacros.cmake
@@ -105,14 +105,14 @@ macro(find_dune_package module)
extract_major_minor_version("${DUNE_FIND_VERSION_NUMBER}" DUNE_FIND_VERSION)
set(DUNE_FIND_VERSION_STRING "${DUNE_FIND_VERSION_MAJOR}.${DUNE_FIND_VERSION_MINOR}.${DUNE_FIND_VERSION_REVISION}")
endif(DUNE_FIND_VERSION MATCHES "(>=|=|<=).*")
- if(NOT DUNE_${module}_FOUND)
+ if(NOT ${module}_FOUND)
if(NOT (${module}_DIR OR ${module}_ROOT OR
"${CMAKE_PREFIX_PATH}" MATCHES ".*${module}.*"))
string(REPLACE ${ProjectName} ${module} ${module}_DIR
${PROJECT_BINARY_DIR})
endif()
find_package(${module} ${DUNE_FIND_VERSION_STRING} NO_CMAKE_PACKAGE_REGISTRY)
- endif(NOT DUNE_${module}_FOUND)
+ endif(NOT ${module}_FOUND)
if(NOT ${module}_FOUND)
message(STATUS "No full CMake package configuration support available."
" Falling back to pkg-config.")
--
GitLab