From 2fc0cf667ddf7915c26b1ed3f68b0481a548633c Mon Sep 17 00:00:00 2001 From: Marius Gripsgard Date: Sun, 9 Sep 2018 21:08:20 +0200 Subject: [PATCH] Move ENABLE_TOUCH_INPUT option to before 'src' gets included If its after 'src' gets included, it simply ignores the cxx flag. --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f4119995..b59987cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,6 +81,11 @@ if (ENABLE_MIR) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMIR_SUPPORT") endif() +option(ENABLE_TOUCH_INPUT "Enable touch input support" OFF) +if (ENABLE_TOUCH_INPUT) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_TOUCH_INPUT") +endif() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMESA_EGL_NO_X11_HEADERS") ##################################################################### @@ -140,8 +145,3 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" IMMEDIATE @ONLY) add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") - -option(ENABLE_TOUCH_INPUT "Enable touch input support" OFF) -if (ENABLE_TOUCH_INPUT) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_TOUCH_INPUT") -endif() -- GitLab