Skip to content

Commit 0828530

Browse files
committed
sync sd latest and add wrap with sd_image_t
1 parent 883704d commit 0828530

File tree

6 files changed

+54
-387
lines changed

6 files changed

+54
-387
lines changed

.idea/vcs.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/workspace.xml

Lines changed: 30 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CMakeLists.txt

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,20 @@ set(SD_ABI sd-abi)
4848

4949
add_library(${SD_ABI} SHARED
5050
stable-diffusion-abi.cpp
51-
stable-diffusion-abi.h)
51+
stable-diffusion-abi.h
52+
${sd_SOURCE_DIR}/stable-diffusion.h
53+
${sd_SOURCE_DIR}/stable-diffusion.cpp
54+
)
5255

5356
target_include_directories(${SD_ABI} PUBLIC .)
57+
target_include_directories(${SD_ABI} PUBLIC ${sd_SOURCE_DIR} .)
5458

5559
set_target_properties(zip PROPERTIES POSITION_INDEPENDENT_CODE ON)
5660
set_target_properties(ggml PROPERTIES POSITION_INDEPENDENT_CODE ON)
5761
set_target_properties(stable-diffusion PROPERTIES POSITION_INDEPENDENT_CODE ON)
62+
target_compile_definitions(${SD_ABI} PUBLIC SD_BUILD_SHARED_LIB)
63+
target_compile_definitions(${SD_ABI} PRIVATE SD_BUILD_DLL)
5864
set_target_properties(${SD_ABI} PROPERTIES POSITION_INDEPENDENT_CODE ON)
59-
target_compile_definitions(${SD_ABI} PRIVATE STABLE_DIFFUSION_SHARED STABLE_DIFFUSION_BUILD)
60-
target_link_libraries(${SD_ABI} PRIVATE stable-diffusion ${CMAKE_THREAD_LIBS_INIT})
65+
target_compile_definitions(${SD_ABI} PUBLIC STABLE_DIFFUSION_SHARED STABLE_DIFFUSION_BUILD)
66+
target_compile_definitions(${SD_ABI} PRIVATE STABLE_DIFFUSION_BUILD)
67+
target_link_libraries(${SD_ABI} PUBLIC stable-diffusion)

cmake/sd.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ if(${CMAKE_VERSION} VERSION_LESS 3.14)
44
include(add_FetchContent_MakeAvailable.cmake)
55
endif()
66

7-
set(SD_GIT_TAG f2e4d9793bbe0ec713c28cc55b123c68afd8db90)
7+
set(SD_GIT_TAG 7cb41b190fb9b4703f1737171cefd0abec861154)
88
set(SD_GIT_URL https://github.com/leejet/stable-diffusion.cpp)
9-
set(BUILD_SHARED_LIBS OFF)
9+
#set(BUILD_SHARED_LIBS OFF)
1010

1111
FetchContent_Declare(
1212
sd

0 commit comments

Comments
 (0)