diff options
| author | Chia-I Wu <olvaffe@gmail.com> | 2014-09-18 17:05:09 +0800 |
|---|---|---|
| committer | Chia-I Wu <olvaffe@gmail.com> | 2014-09-18 17:27:55 +0800 |
| commit | b834ccbcb6b63b5ed8a726d1485e579aedde2776 (patch) | |
| tree | be192ef2f0236cd50a52b058c96b2167e9ec528d | |
| parent | 35fe31d64818b1fc522e2c3320b36a297a373848 (diff) | |
| download | usermoji-b834ccbcb6b63b5ed8a726d1485e579aedde2776.tar.xz | |
tidy up the build system a bit
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | icd/common/CMakeLists.txt | 22 |
2 files changed, 21 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c6bdaaa..3cbeb2cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,14 +9,6 @@ project (XGL) include_directories("${PROJECT_SOURCE_DIR}/include") include(FindPkgConfig) -pkg_check_modules(LIBDRM REQUIRED libdrm) -if (NOT LIBDRM_FOUND) - message(FATAL_ERROR "libdrm not found") -endif() -pkg_check_modules(LIBDRM_INTEL REQUIRED libdrm_intel) -if (NOT LIBDRM_INTEL_FOUND) - message(FATAL_ERROR "libdrm not found") -endif() if (CMAKE_COMPILER_IS_GNUCC) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Werror -Wall -Wextra -Wno-sign-compare -Wno-unused-parameter") diff --git a/icd/common/CMakeLists.txt b/icd/common/CMakeLists.txt index dc6e3bd7..866d2b65 100644 --- a/icd/common/CMakeLists.txt +++ b/icd/common/CMakeLists.txt @@ -9,5 +9,25 @@ add_custom_command(OUTPUT icd-dispatch-entrypoints.c DEPENDS ${PROJECT_SOURCE_DIR}/xgl-generate.py ${PROJECT_SOURCE_DIR}/xgl.py) -add_library(icd OBJECT icd.c icd-dispatch-entrypoints.c icd-dispatch-table.h icd-enumerate-drm.c icd-format.c icd-utils.c) +set(ICD_SOURCES + icd.c + icd-dispatch-entrypoints.c + icd-dispatch-table.h + icd-format.c + icd-utils.c) + +set(ICD_REQUIRED_MODULES) + +if (UNIX) + set(ICD_REQUIRED_MODULES ${ICD_REQUIRED_MODULES} libudev) + set(ICD_SOURCES ${ICD_SOURCES} icd-enumerate-drm.c) +endif() + +pkg_check_modules(ICD REQUIRED ${ICD_REQUIRED_MODULES}) + +include_directories( + ${ICD_INCLUDE_DIRS} +) + +add_library(icd OBJECT ${ICD_SOURCES}) set_target_properties(icd PROPERTIES POSITION_INDEPENDENT_CODE ON) |