From 269cd0d3ebdc54730181d1e09cdb0a9e6784ad25 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@lunarg.com>
Date: Sat, 10 Jan 2015 23:21:30 +0800
Subject: [PATCH] icd: clean up build rules

- lowercase local variables
- 4-space indentation
- use FindUdev
- use target_include_directories
- use target_link_libraries
---
 icd/CMakeLists.txt        |  2 --
 icd/common/CMakeLists.txt | 33 +++++++++++++++++----------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/icd/CMakeLists.txt b/icd/CMakeLists.txt
index d7ceb38f..9124ae3c 100644
--- a/icd/CMakeLists.txt
+++ b/icd/CMakeLists.txt
@@ -1,4 +1,2 @@
-include_directories("common")
-
 add_subdirectory(common)
 add_subdirectory(intel)
diff --git a/icd/common/CMakeLists.txt b/icd/common/CMakeLists.txt
index b9700d9d..e1946cf3 100644
--- a/icd/common/CMakeLists.txt
+++ b/icd/common/CMakeLists.txt
@@ -1,21 +1,22 @@
-set(ICD_SOURCES
-	icd-alloc.c
-	icd-format.c
-	icd-log.c
-	icd-utils.c)
+set(sources
+    icd-alloc.c
+    icd-format.c
+    icd-log.c
+    icd-utils.c)
 
-set(ICD_REQUIRED_MODULES)
+set(include_dirs "")
+set(libraries "")
 
-if (UNIX)
-	set(ICD_REQUIRED_MODULES ${ICD_REQUIRED_MODULES} libudev)
-	set(ICD_SOURCES ${ICD_SOURCES} icd-enumerate-drm.c)
+if(UNIX)
+    find_package(UDev REQUIRED)
+    list(APPEND include_dirs ${UDEV_INCLUDE_DIRS})
+    list(APPEND libraries ${UDEV_LIBRARIES})
+    list(APPEND sources icd-enumerate-drm.c)
 endif()
 
-pkg_check_modules(ICD REQUIRED ${ICD_REQUIRED_MODULES})
-
-include_directories(
-	${ICD_INCLUDE_DIRS}
-)
-
-add_library(icd STATIC ${ICD_SOURCES})
+add_library(icd STATIC ${sources})
+target_include_directories(icd
+    PRIVATE ${include_dirs}
+    INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(icd ${libraries})
 set_target_properties(icd PROPERTIES POSITION_INDEPENDENT_CODE ON)
-- 
2.34.1