diff options
| author | Chia-I Wu <olv@lunarg.com> | 2015-01-04 00:31:33 +0800 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-02-04 17:58:03 -0700 |
| commit | 19f61a5cb8abdca8fb8a0a952f0cde7d113195ff (patch) | |
| tree | 6bcd1eed2921ac4b6faf58b719f600216f8bdc81 | |
| parent | fb743de50680ffea64979aa969efface2beb6ea8 (diff) | |
| download | usermoji-19f61a5cb8abdca8fb8a0a952f0cde7d113195ff.tar.xz | |
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.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | icd/common/CMakeLists.txt | 8 |
2 files changed, 2 insertions, 7 deletions
@@ -6,6 +6,7 @@ __pycache__ XGLConfig.h *.so *.so.* +icd/common/libicd.a loader/dispatch.c tests/xgl_image_tests tests/xgl_render_tests 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) |