Commit b009a64d authored by deuce's avatar deuce
Browse files

Remove leftover bits of the X11 option.

Fix up finding packages.
parent cff28eff
...@@ -26,11 +26,9 @@ if(CURSES_FOUND) ...@@ -26,11 +26,9 @@ if(CURSES_FOUND)
endif() endif()
if(X11_FOUND) if(X11_FOUND)
if(X11) list(APPEND SOURCE x_events.c x_cio.c)
list(APPEND SOURCE x_events.c x_cio.c) set(NEED_BITMAP TRUE)
set(NEED_BITMAP TRUE) set(NEED_DLOPEN TRUE)
set(NEED_DLOPEN TRUE)
endif()
endif() endif()
if(SDL_FOUND) if(SDL_FOUND)
...@@ -48,9 +46,11 @@ if(NEED_BITMAP) ...@@ -48,9 +46,11 @@ if(NEED_BITMAP)
endif() endif()
add_library(ciolib SHARED ${SOURCE}) add_library(ciolib SHARED ${SOURCE})
find_package(XPDev REQUIRED) if(NOT ${PARENT_DIRECTORY})
include(${XPDev_CONFIG}) find_package(XPDev REQUIRED)
add_dependencies(ciolib xpdev) include(${XPDev_CONFIG})
endif()
add_dependencies(ciolib XPDev)
target_include_directories(ciolib PRIVATE "${XPDev_DIR}/../../../include/xpdev") target_include_directories(ciolib PRIVATE "${XPDev_DIR}/../../../include/xpdev")
target_compile_definitions(ciolib PRIVATE $<TARGET_PROPERTY:xpdev,INTERFACE_COMPILE_DEFINITIONS>) target_compile_definitions(ciolib PRIVATE $<TARGET_PROPERTY:xpdev,INTERFACE_COMPILE_DEFINITIONS>)
target_include_directories(ciolib PRIVATE $<TARGET_PROPERTY:xpdev,INTERFACE_INCLUDE_DIRECTORIES>) target_include_directories(ciolib PRIVATE $<TARGET_PROPERTY:xpdev,INTERFACE_INCLUDE_DIRECTORIES>)
...@@ -85,7 +85,6 @@ set(INSTALL_HEADERS ...@@ -85,7 +85,6 @@ set(INSTALL_HEADERS
) )
export(PACKAGE CIOLib) export(PACKAGE CIOLib)
export(TARGETS ciolib FILE CIOLibConfig.cmake)
install(TARGETS ciolib DESTINATION lib EXPORT CIOLibConfig) install(TARGETS ciolib DESTINATION lib EXPORT CIOLibConfig)
install(FILES ${INSTALL_HEADERS} DESTINATION include) install(FILES ${INSTALL_HEADERS} DESTINATION include)
......
Markdown is supported
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