ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move xrandr to irrlicht cmake file and also fixed indentations

Browse Source
This commit is contained in:
Deve 2017-09-18 22:14:43 +02:00
parent 66cebbdbe7
commit 71334bac5b
2 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -255,10 +255,6 @@ if(UNIX AND NOT APPLE AND NOT SERVER_ONLY)
find_package(X11 REQUIRED) find_package(X11 REQUIRED)
include_directories(${X11_INCLUDE_DIR}) include_directories(${X11_INCLUDE_DIR})
if(NOT X11_Xrandr_FOUND)
message(FATAL_ERROR "XRANDR not found.")
endif()
if(USE_LIBBFD) if(USE_LIBBFD)
find_package(Libbfd) find_package(Libbfd)
if(LIBBFD_FOUND) if(LIBBFD_FOUND)
@ -418,7 +414,7 @@ if(NOT SERVER_ONLY)
endif() endif()
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
target_link_libraries(supertuxkart ${X11_X11_LIB} ${X11_Xrandr_LIB}) target_link_libraries(supertuxkart ${X11_X11_LIB})
if(USE_LIBBFD) if(USE_LIBBFD)
target_link_libraries(supertuxkart ${LIBBFD_LIBRARIES}) target_link_libraries(supertuxkart ${LIBBFD_LIBRARIES})
endif() endif()

25
lib/irrlicht/CMakeLists.txt
View File

@ -12,7 +12,7 @@ if(MSVC OR APPLE)
"${CMAKE_CURRENT_BINARY_DIR}/../libpng/") "${CMAKE_CURRENT_BINARY_DIR}/../libpng/")
endif() endif()
if (NOT SERVER_ONLY) if(NOT SERVER_ONLY)
if(NOT USE_GLES2) if(NOT USE_GLES2)
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
include_directories(${OPENGL_INCLUDE_DIR}) include_directories(${OPENGL_INCLUDE_DIR})
@ -21,6 +21,14 @@ if (NOT SERVER_ONLY)
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
find_package(X11 REQUIRED) find_package(X11 REQUIRED)
include_directories(${X11_INCLUDE_DIR}) include_directories(${X11_INCLUDE_DIR})
if(NOT X11_FOUND)
message(FATAL_ERROR "X11 not found.")
endif()
if(NOT X11_Xrandr_FOUND)
message(FATAL_ERROR "XRANDR not found.")
endif()
endif() endif()
if(ENABLE_WAYLAND_DEVICE) if(ENABLE_WAYLAND_DEVICE)
@ -572,14 +580,21 @@ if(APPLE)
endif() endif()
add_library(stkirrlicht STATIC ${IRRLICHT_SOURCES}) add_library(stkirrlicht STATIC ${IRRLICHT_SOURCES})
target_link_libraries(stkirrlicht ${PNG_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARY}) target_link_libraries(stkirrlicht ${PNG_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARY})
if(USE_GLES2 OR ENABLE_WAYLAND_DEVICE) if(NOT SERVER_ONLY)
target_link_libraries(stkirrlicht ${EGL_LIBRARY}) if(UNIX AND NOT APPLE)
endif() target_link_libraries(stkirrlicht ${X11_X11_LIB} ${X11_Xrandr_LIB})
endif()
if(ENABLE_WAYLAND_DEVICE) if(USE_GLES2 OR ENABLE_WAYLAND_DEVICE)
target_link_libraries(stkirrlicht ${EGL_LIBRARY})
endif()
if(ENABLE_WAYLAND_DEVICE)
target_link_libraries(stkirrlicht ${WAYLAND_LIBRARIES}) target_link_libraries(stkirrlicht ${WAYLAND_LIBRARIES})
endif()
endif() endif()
if(WIN32) if(WIN32)