Merge pull request #906 from ubports/touch-enable-move

Move ENABLE_TOUCH_INPUT option to before 'src' gets included
This commit is contained in:
Simon Fels 2018-09-15 18:10:43 +02:00 committed by GitHub
commit c8a760c1f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -87,6 +87,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")
#####################################################################
@ -146,8 +151,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()