47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
From 8ed7b093ea4d7ed8e435cb7704e5a30418356796 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
|
Date: Mon, 29 Oct 2018 22:40:32 +0100
|
|
Subject: [PATCH] remove try_run by try_compile in breeze-icon-check
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
try_run does not work in cross environments
|
|
|
|
Upstream-Status: Inappropriate [embedded specific]
|
|
|
|
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
|
---
|
|
cmake/modules/CheckGlobalBreezeIcons.cmake | 18 ------------------
|
|
1 file changed, 18 deletions(-)
|
|
|
|
diff --git a/cmake/modules/CheckGlobalBreezeIcons.cmake b/cmake/modules/CheckGlobalBreezeIcons.cmake
|
|
index 9763213..dfff662 100644
|
|
--- a/cmake/modules/CheckGlobalBreezeIcons.cmake
|
|
+++ b/cmake/modules/CheckGlobalBreezeIcons.cmake
|
|
@@ -24,21 +24,3 @@ else()
|
|
set(CheckGlobalBreezeIcons_libs Qt5::Xml)
|
|
endif()
|
|
|
|
-try_run(RUN_RESULT COMPILE_OK
|
|
- ${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp
|
|
- ${CMAKE_SOURCE_DIR}/cmake/modules/CheckGlobalBreezeIcons.cpp
|
|
- COMPILE_DEFINITIONS ${CheckGlobalBreezeIcons_defs}
|
|
- LINK_LIBRARIES ${CheckGlobalBreezeIcons_libs}
|
|
- CMAKE_FLAGS ${CheckGlobalBreezeIcons_flags}
|
|
- COMPILE_OUTPUT_VARIABLE COMPILE_OUTPUT
|
|
- RUN_OUTPUT_VARIABLE RUN_OUTPUT)
|
|
-
|
|
-if(NOT COMPILE_OK)
|
|
- message(FATAL_ERROR "${COMPILE_OUTPUT}")
|
|
-endif()
|
|
-
|
|
-if(NOT ${RUN_RESULT} EQUAL 0)
|
|
- message(FATAL_ERROR "No valid breeze-icons.rcc resource file found. \
|
|
-The CheckGlobalBreezeIcons.cmake script returned ${RUN_RESULT}.\n \
|
|
-Result: ${RUN_OUTPUT}")
|
|
-endif()
|
|
--
|
|
2.14.4
|
|
|