christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

reduced cmake cache variable namespace pollution

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1403 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
hsc
2012-07-02 17:16:30 +00:00
parent 4c3c5d53ab
commit 80076ec568
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/FindLibPCL.cmake
View File

@ -19,3 +19,4 @@ INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(libPCL DEFAULT_MSG LIBPCL_LIBRARIES LIBPCL_INCLUDE_DIRS) FIND_PACKAGE_HANDLE_STANDARD_ARGS(libPCL DEFAULT_MSG LIBPCL_LIBRARIES LIBPCL_INCLUDE_DIRS)
MARK_AS_ADVANCED(LIBPCL_INCLUDE_DIRS LIBPCL_LIBRARIES) MARK_AS_ADVANCED(LIBPCL_INCLUDE_DIRS LIBPCL_LIBRARIES)
unset(libPCL_DIR CACHE)

2
cmake/FindLibUdis86.cmake
View File

@ -18,4 +18,4 @@ FIND_LIBRARY(LIBUDIS86_LIBRARIES NAMES udis86
INCLUDE(FindPackageHandleStandardArgs) INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(libudis86 DEFAULT_MSG LIBUDIS86_LIBRARIES LIBUDIS86_INCLUDE_DIRS) FIND_PACKAGE_HANDLE_STANDARD_ARGS(libudis86 DEFAULT_MSG LIBUDIS86_LIBRARIES LIBUDIS86_INCLUDE_DIRS)
MARK_AS_ADVANCED(LIBUDIS86_INCLUDE_DIRS LIBUDIS86_LIBRARIES) MARK_AS_ADVANCED(LIBUDIS86_INCLUDE_DIR LIBUDIS86_INCLUDE_DIRS LIBUDIS86_LIBRARIES)

17
cmake/bochs.cmake
View File

@ -10,18 +10,27 @@ if(BUILD_BOCHS)
if(SDL_FOUND) if(SDL_FOUND)
set(bochs_library_dependencies ${bochs_library_dependencies} ${SDL_LIBRARY}) set(bochs_library_dependencies ${bochs_library_dependencies} ${SDL_LIBRARY})
endif(SDL_FOUND) endif(SDL_FOUND)
unset(FindSDL_DIR CACHE)
unset(SDLMAIN_LIBRARY CACHE)
unset(SDL_INCLUDE_DIR CACHE)
unset(SDL_LIBRARY CACHE)
find_package(ALSA) # -lasoud find_package(ALSA) # -lasoud
if(ALSA_FOUND) if(ALSA_FOUND)
set(bochs_library_dependencies ${bochs_library_dependencies} ${ALSA_LIBRARIES}) set(bochs_library_dependencies ${bochs_library_dependencies} ${ALSA_LIBRARIES})
endif(ALSA_FOUND) endif(ALSA_FOUND)
unset(FindALSA_DIR CACHE)
find_package(GTK2 COMPONENTS gtk) # -latk-1.0 -lcairo -lgdk_pixbuf-2.0 -lgdk-x11-2.0 -lglib-2.0 -lgobject-2.0 -lgtk-x11-2.0 -lpango find_package(GTK2 COMPONENTS gtk) # -latk-1.0 -lcairo -lgdk_pixbuf-2.0 -lgdk-x11-2.0 -lglib-2.0 -lgobject-2.0 -lgtk-x11-2.0 -lpango
if(GTK2_FOUND) if(GTK2_FOUND)
set(bochs_library_dependencies ${bochs_library_dependencies} ${GTK2_ATK_LIBRARY} ${GTK2_CAIRO_LIBRARY} ${GTK2_GDK_PIXBUF_LIBRARY} ${GTK2_GDK_LIBRARY} ${GTK2_GLIB_LIBRARY} -lgmodule-2.0 ${GTK2_GOBJECT_LIBRARY} -lgthread-2.0 ${GTK2_GTK_LIBRARY} ${GTK2_PANGO_LIBRARY} -lpangocairo-1.0 -lpangoft2-1.0) set(bochs_library_dependencies ${bochs_library_dependencies} ${GTK2_ATK_LIBRARY} ${GTK2_CAIRO_LIBRARY} ${GTK2_GDK_PIXBUF_LIBRARY} ${GTK2_GDK_LIBRARY} ${GTK2_GLIB_LIBRARY} -lgmodule-2.0 ${GTK2_GOBJECT_LIBRARY} -lgthread-2.0 ${GTK2_GTK_LIBRARY} ${GTK2_PANGO_LIBRARY} -lpangocairo-1.0 -lpangoft2-1.0)
endif(GTK2_FOUND) endif(GTK2_FOUND)
unset(FindGTK2_DIR CACHE)
unset(GTK2_GIOCONFIG_INCLUDE_DIR CACHE)
unset(GTK2_GIO_INCLUDE_DIR CACHE)
find_package(Freetype) # -lfreetype find_package(Freetype) # -lfreetype
if(FREETYPE_FOUND) if(FREETYPE_FOUND)
set(bochs_library_dependencies ${bochs_library_dependencies} ${FREETYPE_LIBRARIES}) set(bochs_library_dependencies ${bochs_library_dependencies} ${FREETYPE_LIBRARIES})
endif(FREETYPE_FOUND) endif(FREETYPE_FOUND)
unset(FindFreetype_DIR CACHE)
find_package(X11) # -lICE -lX11 -lXpm -lXrandr -lSM find_package(X11) # -lICE -lX11 -lXpm -lXrandr -lSM
if(X11_FOUND) if(X11_FOUND)
set(bochs_library_dependencies ${bochs_library_dependencies} ${X11_X11_LIB}) set(bochs_library_dependencies ${bochs_library_dependencies} ${X11_X11_LIB})
@ -38,15 +47,23 @@ if(BUILD_BOCHS)
if(X11_SM_FOUND) if(X11_SM_FOUND)
set(bochs_library_dependencies ${bochs_library_dependencies} ${X11_SM_LIB}) set(bochs_library_dependencies ${bochs_library_dependencies} ${X11_SM_LIB})
endif(X11_SM_FOUND) endif(X11_SM_FOUND)
unset(FindX11_DIR CACHE)
find_package(Curses) # -lncurses find_package(Curses) # -lncurses
if(CURSES_FOUND) if(CURSES_FOUND)
set(bochs_library_dependencies ${bochs_library_dependencies} ${CURSES_LIBRARIES}) set(bochs_library_dependencies ${bochs_library_dependencies} ${CURSES_LIBRARIES})
endif(CURSES_FOUND) endif(CURSES_FOUND)
unset(CURSES_CURSES_H_PATH CACHE)
unset(CURSES_FORM_LIBRARY CACHE)
unset(CURSES_HAVE_CURSES_H CACHE)
unset(FindCurses_DIR CACHE)
find_package(wxWidgets) # -lwx_baseu-2.8? -lwx_gtk2u_core-2.8 find_package(wxWidgets) # -lwx_baseu-2.8? -lwx_gtk2u_core-2.8
if(wxWidgets_FOUND) if(wxWidgets_FOUND)
set(bochs_library_dependencies ${bochs_library_dependencies} ${wxWidgets_LIBRARIES}) set(bochs_library_dependencies ${bochs_library_dependencies} ${wxWidgets_LIBRARIES})
link_directories(${wxWidgets_LIB_DIR}) link_directories(${wxWidgets_LIB_DIR})
endif(wxWidgets_FOUND) endif(wxWidgets_FOUND)
unset(FindwxWidgets_DIR CACHE)
unset(wxWidgets_USE_DEBUG CACHE)
mark_as_advanced(wxWidgets_CONFIG_EXECUTABLE wxWidgets_wxrc_EXECUTABLE)
# FIXME: some libraries still need to be located the "cmake way" # FIXME: some libraries still need to be located the "cmake way"
set(bochs_library_dependencies ${bochs_library_dependencies} -lfontconfig -lrt -lvga -lvgagl -pthread) set(bochs_library_dependencies ${bochs_library_dependencies} -lfontconfig -lrt -lvga -lvgagl -pthread)