Commit 0a14f697 authored by Brad King's avatar Brad King 💬
Browse files

BUG: Don't add -I/usr/include as an X_CFLAGS setting.

parent 20430813
...@@ -28,8 +28,12 @@ IF(NOT CMAKE_SKIP_COMPATIBILITY_TESTS) ...@@ -28,8 +28,12 @@ IF(NOT CMAKE_SKIP_COMPATIBILITY_TESTS)
TEST_BIG_ENDIAN(CMAKE_WORDS_BIGENDIAN) TEST_BIG_ENDIAN(CMAKE_WORDS_BIGENDIAN)
INCLUDE (${CMAKE_ROOT}/Modules/FindX11.cmake) INCLUDE (${CMAKE_ROOT}/Modules/FindX11.cmake)
SET (CMAKE_X_CFLAGS "-I${CMAKE_X11_INCLUDE_PATH}" CACHE STRING IF("${CMAKE_X11_INCLUDE_PATH}" MATCHES "^/usr/include$")
"X11 extra flags.") SET (CMAKE_X_CFLAGS "" CACHE STRING "X11 extra flags.")
ELSE("${CMAKE_X11_INCLUDE_PATH}" MATCHES "^/usr/include$")
SET (CMAKE_X_CFLAGS "-I${CMAKE_X11_INCLUDE_PATH}" CACHE STRING
"X11 extra flags.")
ENDIF("${CMAKE_X11_INCLUDE_PATH}" MATCHES "^/usr/include$")
SET (CMAKE_X_LIBS "${CMAKE_X_LIBS}" CACHE STRING SET (CMAKE_X_LIBS "${CMAKE_X_LIBS}" CACHE STRING
"Libraries and options used in X11 programs.") "Libraries and options used in X11 programs.")
SET (CMAKE_HAS_X "${CMAKE_HAS_X}" CACHE INTERNAL "Is X11 around.") SET (CMAKE_HAS_X "${CMAKE_HAS_X}" CACHE INTERNAL "Is X11 around.")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment