Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Main
Synchronet
Commits
b009a64d
Commit
b009a64d
authored
Feb 09, 2014
by
deuce
Browse files
Remove leftover bits of the X11 option.
Fix up finding packages.
parent
cff28eff
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
9 deletions
+8
-9
src/conio/CMakeLists.txt
src/conio/CMakeLists.txt
+8
-9
No files found.
src/conio/CMakeLists.txt
View file @
b009a64d
...
...
@@ -26,11 +26,9 @@ if(CURSES_FOUND)
endif
()
if
(
X11_FOUND
)
if
(
X11
)
list
(
APPEND SOURCE x_events.c x_cio.c
)
set
(
NEED_BITMAP TRUE
)
set
(
NEED_DLOPEN TRUE
)
endif
()
list
(
APPEND SOURCE x_events.c x_cio.c
)
set
(
NEED_BITMAP TRUE
)
set
(
NEED_DLOPEN TRUE
)
endif
()
if
(
SDL_FOUND
)
...
...
@@ -48,9 +46,11 @@ if(NEED_BITMAP)
endif
()
add_library
(
ciolib SHARED
${
SOURCE
}
)
find_package
(
XPDev REQUIRED
)
include
(
${
XPDev_CONFIG
}
)
add_dependencies
(
ciolib xpdev
)
if
(
NOT
${
PARENT_DIRECTORY
}
)
find_package
(
XPDev REQUIRED
)
include
(
${
XPDev_CONFIG
}
)
endif
()
add_dependencies
(
ciolib XPDev
)
target_include_directories
(
ciolib PRIVATE
"
${
XPDev_DIR
}
/../../../include/xpdev"
)
target_compile_definitions
(
ciolib PRIVATE $<TARGET_PROPERTY:xpdev,INTERFACE_COMPILE_DEFINITIONS>
)
target_include_directories
(
ciolib PRIVATE $<TARGET_PROPERTY:xpdev,INTERFACE_INCLUDE_DIRECTORIES>
)
...
...
@@ -85,7 +85,6 @@ set(INSTALL_HEADERS
)
export
(
PACKAGE CIOLib
)
export
(
TARGETS ciolib FILE CIOLibConfig.cmake
)
install
(
TARGETS ciolib DESTINATION lib EXPORT CIOLibConfig
)
install
(
FILES
${
INSTALL_HEADERS
}
DESTINATION include
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment