diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 19:49:43 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 19:50:14 +0300 |
| commit | da53c3f02006b87e80ae898d1927a215b97cc934 (patch) | |
| tree | f6c00c72822ad164586540a3602a20a3d4f9b6fb /intern/ghost/test/CMakeLists.txt | |
| parent | c8af234f855ccd29d042f5298f7dea05922a350e (diff) | |
| parent | 58e8c71cbd91931f97607ab8b028624b3e90455e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/ghost/test/CMakeLists.txt')
| -rw-r--r-- | intern/ghost/test/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/ghost/test/CMakeLists.txt b/intern/ghost/test/CMakeLists.txt index 0cec217630c..9f714ae4fba 100644 --- a/intern/ghost/test/CMakeLists.txt +++ b/intern/ghost/test/CMakeLists.txt @@ -103,7 +103,7 @@ suffix_relpaths(SRC_NEW "${SRC}" "../../guardedalloc/") include_directories(${INC_NEW}) add_library(guardedalloc_lib ${SRC_NEW}) -# blenfont +# blenfont include(${CMAKE_SOURCE_DIR}/../../../source/blender/blenfont/CMakeLists.txt) suffix_relpaths(INC_NEW "${INC}" "../../../source/blender/blenfont/") suffix_relpaths(SRC_NEW "${SRC}" "../../../source/blender/blenfont/") @@ -128,7 +128,7 @@ add_library(glewmx_lib ${SRC_NEW}) include_directories( "../../../source/blender/blenlib" ) -add_library(bli_lib +add_library(bli_lib "../../../source/blender/blenlib/intern/fileops.c" "../../../source/blender/blenlib/intern/gsqueue.c" "../../../source/blender/blenlib/intern/rct.c" |