christoph/fail
1
Fork 0
Code Releases Activity

cmake: CMake-style look for VGA lib.

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@2101 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
hoffmann
2013-02-15 12:34:16 +00:00
parent 7605dfa4c4
commit 425b6e3129
2 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
cmake/FindVGA.cmake Normal file
View File

@ -0,0 +1,36 @@
# Find vga-related library information for Linux
# This module defines the following uncached variables:
# VGA_FOUND, if false, do not try to use VGA.
# VGA_INCLUDE_DIRS, where to find vga.h.
# VGA_LIBRARIES, the libraries to link against to use the vga library
# VGA_LIBRARY_DIRS, the directory where the vga library is found.
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
find_path(VGA_INCLUDE_DIR vga.h /usr/local/include /usr/include)
if(VGA_INCLUDE_DIR)
find_library(VGA_LIBRARY
NAMES vga
PATHS /usr/local/lib /usr/lib
)
if(VGA_LIBRARY)
set(VGA_LIBRARY_DIR "")
get_filename_component(VGA_LIBRARY_DIRS ${VGA_LIBRARY} PATH)
# Set uncached variables as per standard.
set(VGA_FOUND ON)
set(VGA_INCLUDE_DIRS ${VGA_INCLUDE_DIR})
set(VGA_LIBRARIES ${VGA_LIBRARY})
endif(VGA_LIBRARY)
endif(VGA_INCLUDE_DIR)
if(VGA_FOUND)
if(NOT VGA_FIND_QUIETLY)
message(STATUS "FindVGA: Found both vga.h and the vga library")
endif(NOT VGA_FIND_QUIETLY)
else(VGA_FOUND)
if(VGA_FIND_REQUIRED)
message(FATAL_ERROR "FindVGA: Could not find vga.h and/or the vga library")
endif(VGA_FIND_REQUIRED)
endif(VGA_FOUND)
endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")

8
cmake/bochs.cmake
View File

@ -65,8 +65,14 @@ if(BUILD_BOCHS)
unset(wxWidgets_USE_DEBUG CACHE)
mark_as_advanced(wxWidgets_CONFIG_EXECUTABLE wxWidgets_wxrc_EXECUTABLE)
find_package(VGA)
if(VGA_FOUND)
set(bochs_library_dependencies ${bochs_library_dependencies} ${VGA_LIBRARIES})
endif()
# 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 -lvgagl -pthread)
set(bochs_src_dir ${PROJECT_SOURCE_DIR}/simulators/bochs)