FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- changed the main INCLUDE_DIRECTORIES definition to place the main header

Browse Source 
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: https://svn.code.sf.net/p/freeglut/code/trunk@1745 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
jtsiomb 2015-02-18 04:59:57 +00:00
parent 8c295f0617
commit db2ea877b0
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
freeglut/freeglut/CMakeLists.txt
View File

@ -265,10 +265,6 @@ IF(UNIX AND NOT(ANDROID OR BLACKBERRY))
ENDIF() ENDIF()
IF(X11_xf86vmode_FOUND) IF(X11_xf86vmode_FOUND)
SET(HAVE_X11_EXTENSIONS_XF86VMODE_H TRUE) 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}) LIST(APPEND LIBS ${X11_Xxf86vm_LIB})
ENDIF() ENDIF()
IF(X11_Xinput_FOUND) IF(X11_Xinput_FOUND)
@ -329,7 +325,7 @@ ENDIF()
# ensure that all CMake-generated files are kept away from the main source tree. # 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. # 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) 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) ADD_DEFINITIONS(-DHAVE_CONFIG_H)
IF(WIN32) IF(WIN32)
# we also have to generate freeglut.rc, which contains the version # we also have to generate freeglut.rc, which contains the version