From 4c3c5d53abba2f3764f256eada59884eb3b05fd3 Mon Sep 17 00:00:00 2001 From: hsc Date: Mon, 2 Jul 2012 12:03:12 +0000 Subject: [PATCH] more fine-grained X11 library linking git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1401 8c4709b5-6ec9-48aa-a5cd-a96041d1645a --- cmake/bochs.cmake | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/cmake/bochs.cmake b/cmake/bochs.cmake index 9709dfa6..df081d00 100644 --- a/cmake/bochs.cmake +++ b/cmake/bochs.cmake @@ -23,9 +23,21 @@ if(BUILD_BOCHS) set(bochs_library_dependencies ${bochs_library_dependencies} ${FREETYPE_LIBRARIES}) endif(FREETYPE_FOUND) find_package(X11) # -lICE -lX11 -lXpm -lXrandr -lSM - if(X11_FOUND AND X11_ICE_FOUND AND X11_Xpm_FOUND AND X11_Xrandr_FOUND AND X11_SM_FOUND) - set(bochs_library_dependencies ${bochs_library_dependencies} ${X11_X11_LIB} ${X11_ICE_LIB} ${X11_Xpm_LIB} ${X11_Xrandr_LIB} ${X11_SM_LIB}) - endif(X11_FOUND AND X11_ICE_FOUND AND X11_Xpm_FOUND AND X11_Xrandr_FOUND AND X11_SM_FOUND) + if(X11_FOUND) + set(bochs_library_dependencies ${bochs_library_dependencies} ${X11_X11_LIB}) + endif(X11_FOUND) + if(X11_ICE_FOUND) + set(bochs_library_dependencies ${bochs_library_dependencies} ${X11_ICE_LIB}) + endif(X11_ICE_FOUND) + if(X11_Xpm_FOUND) + set(bochs_library_dependencies ${bochs_library_dependencies} ${X11_Xpm_LIB}) + endif(X11_Xpm_FOUND) + if(X11_Xrandr_FOUND) + set(bochs_library_dependencies ${bochs_library_dependencies} ${X11_Xrandr_LIB}) + endif(X11_Xrandr_FOUND) + if(X11_SM_FOUND) + set(bochs_library_dependencies ${bochs_library_dependencies} ${X11_SM_LIB}) + endif(X11_SM_FOUND) find_package(Curses) # -lncurses if(CURSES_FOUND) set(bochs_library_dependencies ${bochs_library_dependencies} ${CURSES_LIBRARIES})