From be2da106eefe36f4c89ba6259953ff36a3b7d53e Mon Sep 17 00:00:00 2001
From: Cristian Adam <cristian.adam@qt.io>
Date: Wed, 26 Feb 2020 13:09:02 +0100
Subject: [PATCH] Utils: clean up CMake code

Re-use an existing variable, which contains the same information.

Change-Id: I1daa6428d67f11dd2efccd43ff6bab76420236ae
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/libs/utils/CMakeLists.txt | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/libs/utils/CMakeLists.txt b/src/libs/utils/CMakeLists.txt
index a0663ebd8f3..ff7bbe62862 100644
--- a/src/libs/utils/CMakeLists.txt
+++ b/src/libs/utils/CMakeLists.txt
@@ -1,19 +1,8 @@
-if (IDE_LIBEXEC_PATH AND IDE_BIN_PATH)
-    get_filename_component(bin_path
-      "${CMAKE_INSTALL_PREFIX}/${IDE_BIN_PATH}" ABSOLUTE "${CMAKE_BINARY_DIR}")
-    get_filename_component(libexec_path
-      "${CMAKE_INSTALL_PREFIX}/${IDE_LIBEXEC_PATH}" ABSOLUTE "${CMAKE_BINARY_DIR}")
-  file(RELATIVE_PATH RELATIVE_TOOLS_PATH "${bin_path}" "${libexec_path}")
-else()
-  message(WARNING "IDE_LIBEXEC_PATH or IDE_BIN_PATH undefined when calculating tools path")
-  set(RELATIVE_TOOLS_PATH "")
-endif()
-
 add_qtc_library(Utils
   DEPENDS Qt5::Xml
   PUBLIC_DEPENDS Qt5::Concurrent Qt5::Core Qt5::Network Qt5::Qml Qt5::Gui Qt5::Widgets
   DEFINES
-    "QTC_REL_TOOLS_PATH=\"${RELATIVE_TOOLS_PATH}\""
+    "QTC_REL_TOOLS_PATH=\"${RELATIVE_LIBEXEC_PATH}\""
   SOURCES
     ../3rdparty/optional/optional.hpp
     ../3rdparty/variant/variant.hpp