From 19f61a5cb8abdca8fb8a0a952f0cde7d113195ff Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@lunarg.com>
Date: Sun, 4 Jan 2015 00:31:33 +0800
Subject: icd: build a static library

libicd was an OBJECT library because it provided the XGL entry points.  That
is not true anymore.  Make it a STATIC library.

v2:
 - update .gitignore
 - stop adding CMAKE_CURRENT_BINARY_DIR to ICD_INCLUDE_DIRS, unnecessary since
   the switch to xglLayer.h some time ago

v3: Make icd appear before ICD_LIBRARIES during linking of libXGL_i965.so.
    It looks like we can do better now that icd is a regular library, but
    leave it as is for now.
---
 icd/common/CMakeLists.txt | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'icd')

diff --git a/icd/common/CMakeLists.txt b/icd/common/CMakeLists.txt
index 3eb6752a..b9700d9d 100644
--- a/icd/common/CMakeLists.txt
+++ b/icd/common/CMakeLists.txt
@@ -13,15 +13,9 @@ endif()
 
 pkg_check_modules(ICD REQUIRED ${ICD_REQUIRED_MODULES})
 
-# icd-dispatch-table.h was generated in ${CMAKE_CURRENT_BINARY_DIR}
-set(ICD_INCLUDE_DIRS
-	${ICD_INCLUDE_DIRS}
-	${CMAKE_CURRENT_BINARY_DIR}
-	CACHE INTERNAL "")
-
 include_directories(
 	${ICD_INCLUDE_DIRS}
 )
 
-add_library(icd OBJECT ${ICD_SOURCES})
+add_library(icd STATIC ${ICD_SOURCES})
 set_target_properties(icd PROPERTIES POSITION_INDEPENDENT_CODE ON)
-- 
cgit v1.2.3