-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
47 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 3565911..e33555e 100755 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -12,8 +12,8 @@ add_library(lunasvg) | ||
|
||
add_subdirectory(include) | ||
add_subdirectory(source) | ||
-add_subdirectory(3rdparty/plutovg) | ||
- | ||
+find_package(plutovg CONFIG REQUIRED) | ||
+target_link_libraries(lunasvg plutovg::plutovg) | ||
target_compile_definitions(lunasvg PRIVATE LUNASVG_BUILD) | ||
if(NOT BUILD_SHARED_LIBS) | ||
target_compile_definitions(lunasvg PRIVATE LUNASVG_BUILD_STATIC) | ||
@@ -25,16 +25,16 @@ if(LUNASVG_BUILD_EXAMPLES) | ||
target_include_directories(svg2png PRIVATE 3rdparty/stb) | ||
endif() | ||
|
||
-set(LUNASVG_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib) | ||
-set(LUNASVG_INCDIR ${CMAKE_INSTALL_PREFIX}/include) | ||
+# set(LUNASVG_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib) | ||
+# set(LUNASVG_INCDIR ${CMAKE_INSTALL_PREFIX}/include) | ||
|
||
install(FILES | ||
include/lunasvg.h | ||
- DESTINATION ${LUNASVG_INCDIR} | ||
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} | ||
) | ||
|
||
install(TARGETS lunasvg | ||
- LIBRARY DESTINATION ${LUNASVG_LIBDIR} | ||
- ARCHIVE DESTINATION ${LUNASVG_LIBDIR} | ||
- INCLUDES DESTINATION ${LUNASVG_INCDIR} | ||
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" | ||
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" | ||
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,6 @@ | ||
versions: | ||
"2.4.1": | ||
folder: all | ||
"2.4.0": | ||
folder: all | ||
"2.3.9": | ||
|