diff --git a/buildscripts/skia/FindSkiaSystem.cmake b/buildscripts/skia/FindSkiaSystem.cmake index 3e4ce9c..f37babb 100644 --- a/buildscripts/skia/FindSkiaSystem.cmake +++ b/buildscripts/skia/FindSkiaSystem.cmake @@ -3,14 +3,14 @@ if(WIN32) set(SKIA_LIBRARIES - skia + skialib user32 opengl32) add_definitions(-DSKIA_DLL) else() if(APPLE) - set(SKIA_LIBRARIES skia) + set(SKIA_LIBRARIES skialib) else() - set(SKIA_LIBRARIES skia.friction) + set(SKIA_LIBRARIES skialib) endif() endif() diff --git a/thirdparty/skia/CMakeLists.txt b/thirdparty/skia/CMakeLists.txt index 2449629..8e6d732 100644 --- a/thirdparty/skia/CMakeLists.txt +++ b/thirdparty/skia/CMakeLists.txt @@ -54,7 +54,7 @@ message(" skia argumentss: ${SKIA_ARGS}") message("-- Building skia as ExternalProject Engine") ExternalProject_Add( - Engine + skialib SOURCE_DIR ${SKIA_SRC} BINARY_DIR ${SKIA_BUILD_DIR} DOWNLOAD_COMMAND : @@ -68,6 +68,7 @@ ExternalProject_Add( USES_TERMINAL_BUILD true ) +add_dependencies(skialib) if(UNIX AND NOT APPLE) include(CopySkiaLibraryToInstallDir)