From 474138adfeb25f1d543dbe2a717f35f21a328fec Mon Sep 17 00:00:00 2001 From: John Tsiombikas Date: Wed, 18 Feb 2015 04:59:57 +0000 Subject: [PATCH] - changed the main INCLUDE_DIRECTORIES definition to place the main header locations first in the list instead of appending them. This gives priority to our freeglut*.h files instead of the old system-wide installed ones. - removed the Xxf86vm hack from CMakeLists.txt: it seems like it's not needed any more in new versions of cmake, and it fails to link on MacOSX. git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1745 7f0cb862-5218-0410-a997-914c9d46530a --- CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 43555fb..28f8651 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -265,10 +265,6 @@ IF(UNIX AND NOT(ANDROID OR BLACKBERRY)) ENDIF() IF(X11_xf86vmode_FOUND) SET(HAVE_X11_EXTENSIONS_XF86VMODE_H TRUE) - # Work-around http://www.cmake.org/Bug/bug_view_page.php?bug_id=6976 - IF(NOT "${X11_Xxf86vm_LIB}") - SET(X11_Xxf86vm_LIB "Xxf86vm") - ENDIF() LIST(APPEND LIBS ${X11_Xxf86vm_LIB}) ENDIF() IF(X11_Xinput_FOUND) @@ -329,7 +325,7 @@ ENDIF() # ensure that all CMake-generated files are kept away from the main source tree. # As a result, the build directory must to be added to the include path list. CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_BINARY_DIR}/config.h) -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/src) +INCLUDE_DIRECTORIES(BEFORE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/src) ADD_DEFINITIONS(-DHAVE_CONFIG_H) IF(WIN32) # we also have to generate freeglut.rc, which contains the version -- 1.7.10.4