diff options
| author | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2021-06-27 06:50:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-27 06:50:47 +0200 |
| commit | 1c08696025124229c6725de2affe82ef4d5f2b34 (patch) | |
| tree | 36aac093c3d237a006bd7d760014c5935a07c84b | |
| parent | Merge pull request #58 from LaG1924/fix/uis-fork-fixes (diff) | |
| parent | Updated FreeType2 and RmlUI (diff) | |
| download | AltCraft-1c08696025124229c6725de2affe82ef4d5f2b34.tar AltCraft-1c08696025124229c6725de2affe82ef4d5f2b34.tar.gz AltCraft-1c08696025124229c6725de2affe82ef4d5f2b34.tar.bz2 AltCraft-1c08696025124229c6725de2affe82ef4d5f2b34.tar.lz AltCraft-1c08696025124229c6725de2affe82ef4d5f2b34.tar.xz AltCraft-1c08696025124229c6725de2affe82ef4d5f2b34.tar.zst AltCraft-1c08696025124229c6725de2affe82ef4d5f2b34.zip | |
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ad24cf..12ae824 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -143,17 +143,17 @@ endif() CPMAddPackage( NAME Freetype - GITHUB_REPOSITORY aseprite/freetype2 - VERSION 2.10.0 - GIT_TAG VER-2-10-0 + GITHUB_REPOSITORY freetype/freetype + VERSION 2.10.4 + GIT_TAG VER-2-10-4 ) export(EXPORT freetype-targets) CPMAddPackage( NAME RmlUi GITHUB_REPOSITORY mikke89/RmlUi - VERSION 4.0 - GIT_TAG 4.0 + VERSION 4.1 + GIT_TAG 4.1 OPTIONS "BUILD_SHARED_LIBS OFF" "BUILD_TESTING OFF" @@ -161,7 +161,6 @@ CPMAddPackage( "BUILD_LUA_BINDINGS ON" ) target_link_libraries(RmlCore freetype lua) -target_compile_definitions(RmlCore PUBLIC RMLUI_STATIC_LIB) ########### # AltCraft @@ -202,8 +201,6 @@ set_target_properties(AltCraft PROPERTIES CXX_STANDARD_REQUIRED ON ) -target_include_directories(AltCraft PRIVATE ${RmlUi_SOURCE_DIR}/Include) - set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT AltCraft) if (MSVC) |