summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaG1924 <lag1924@gmail.com>2021-06-27 04:34:24 +0200
committerLaG1924 <lag1924@gmail.com>2021-06-27 06:29:11 +0200
commitfd90f6a11df9e4d4e99a95bf1d44e8bf0810fb19 (patch)
treea0a9b3a9a2bfd34142e9ce4cdd82ff20485f5877
parentMerge pull request #60 from LaG1924/fix/memleak (diff)
downloadAltCraft-fd90f6a11df9e4d4e99a95bf1d44e8bf0810fb19.tar
AltCraft-fd90f6a11df9e4d4e99a95bf1d44e8bf0810fb19.tar.gz
AltCraft-fd90f6a11df9e4d4e99a95bf1d44e8bf0810fb19.tar.bz2
AltCraft-fd90f6a11df9e4d4e99a95bf1d44e8bf0810fb19.tar.lz
AltCraft-fd90f6a11df9e4d4e99a95bf1d44e8bf0810fb19.tar.xz
AltCraft-fd90f6a11df9e4d4e99a95bf1d44e8bf0810fb19.tar.zst
AltCraft-fd90f6a11df9e4d4e99a95bf1d44e8bf0810fb19.zip
Diffstat (limited to '')
-rw-r--r--CMakeLists.txt13
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)