patch [#28947] Patches for #28943 (Support for XDG Base Directory Specification)
[blender.git] / source / blender / blenlib / CMakeLists.txt
index 35acbe5..5d54ffb 100644 (file)
@@ -1,4 +1,3 @@
-# $Id$
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
 
 set(INC 
        .
-       ../makesdna
        ../blenkernel
+       ../blenloader
        ../gpu
+       ../makesdna
        ../../../intern/ghost
        ../../../intern/guardedalloc
-       ${ZLIB_INC}
+)
+
+set(INC_SYS
+       ${ZLIB_INCLUDE_DIRS}
        ${FREETYPE_INCLUDE_DIRS}
 )
 
@@ -48,6 +51,7 @@ set(SRC
        intern/DLRB_tree.c
        intern/boxpack2d.c
        intern/bpath.c
+       intern/callbacks.c
        intern/cpu.c
        intern/dynlib.c
        intern/edgehash.c
@@ -75,6 +79,7 @@ set(SRC
        intern/scanfill.c
        intern/storage.c
        intern/string.c
+       intern/string_utf8.c
        intern/threads.c
        intern/time.c
        intern/uvproject.c
@@ -85,12 +90,15 @@ set(SRC
        BLI_blenlib.h
        BLI_boxpack2d.h
        BLI_bpath.h
+       BLI_callbacks.h
        BLI_cpu.h
        BLI_dlrbTree.h
+       BLI_dynlib.h
        BLI_dynstr.h
        BLI_edgehash.h
        BLI_editVert.h
        BLI_fileops.h
+       BLI_fileops_types.h
        BLI_fnmatch.h
        BLI_ghash.h
        BLI_graph.h
@@ -117,27 +125,31 @@ set(SRC
        BLI_rand.h
        BLI_rect.h
        BLI_scanfill.h
-       BLI_storage.h
-       BLI_storage_types.h
        BLI_string.h
+       BLI_string_utf8.h
        BLI_threads.h
        BLI_utildefines.h
        BLI_uvproject.h
        BLI_vfontdata.h
        BLI_voxel.h
        BLI_winstuff.h
-       PIL_dynlib.h
        PIL_time.h
-       intern/BLI_callbacks.h
        intern/dynamiclist.h
 )
 
-if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-       list(APPEND INC "${BINRELOC_INC}")
+if(WITH_BINRELOC)
+       list(APPEND INC_SYS
+               ${BINRELOC_INCLUDE_DIRS}
+       )
+       add_definitions(-DWITH_BINRELOC)
 endif()
 
 if(WITH_OPENMP)
        add_definitions(-DPARALLEL=1)
 endif()
 
-blender_add_lib(bf_blenlib "${SRC}" "${INC}")
+if(WITH_XDG_USER_DIRS)
+       add_definitions(-DWITH_XDG_USER_DIRS)
+endif()
+
+blender_add_lib(bf_blenlib "${SRC}" "${INC}" "${INC_SYS}")