OpenE2K
/
dwarves
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/acme/pahole

This commit is contained in:
Arnaldo Carvalho de Melo 2008-12-26 12:20:16 -02:00
parent f890ae7cc1 01db5b1374
commit 5c398cb582
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,5 +1,5 @@
project(pahole C)
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 2.4.8)
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} )

7
cmake/modules/FindDWARF.cmake
View File

@ -64,7 +64,8 @@ if (DWARF_FOUND)
else (DWARF_FOUND)
if (DWARF_FIND_REQUIRED)
find_path(FEDORA fedora-release /etc)
if (FEDORA)
find_path(REDHAT redhat-release /etc)
if (FEDORA OR REDHAT)
if (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR OR NOT EBL_LIBRARY)
message(STATUS "Please install the elfutils-devel package")
endif (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR OR NOT EBL_LIBRARY)
@ -74,7 +75,7 @@ else (DWARF_FOUND)
if (NOT ELF_LIBRARY)
message(STATUS "Please install the elfutils-libelf package")
endif (NOT ELF_LIBRARY)
else (FEDORA)
else (FEDORA OR REDHAT)
if (NOT DWARF_INCLUDE_DIR)
message(STATUS "Could NOT find dwarf include dir")
endif (NOT DWARF_INCLUDE_DIR)
@ -90,7 +91,7 @@ else (DWARF_FOUND)
if (NOT ELF_LIBRARY)
message(STATUS "Could NOT find libelf library")
endif (NOT ELF_LIBRARY)
endif (FEDORA)
endif (FEDORA OR REDHAT)
message(FATAL_ERROR "Could NOT find some ELF and DWARF libraries, please install the missing packages")
endif (DWARF_FIND_REQUIRED)
endif (DWARF_FOUND)