From eb743083de9f22a04db76a610bf5b829202ed1d9 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Thu, 9 Jan 2020 14:44:11 +0100 Subject: [PATCH] Include AngelScript. --- CMakeLists.txt | 2 +- conanfile.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5eca4f3..f3c1941 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ if (NOT EXISTS ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) endif() if (NOT WINDOWS) execute_process(COMMAND conan install ${CMAKE_SOURCE_DIR} --install-folder=${CMAKE_BINARY_DIR} --build missing - -s compiler=clang -s compiler.libcxx=libstdc++11 -s compiler.version=${VERSION}) + -s compiler=clang -s compiler.libcxx=libstdc++11 -s compiler.version=${VERSION} -o AngelScript:shared=True) else() execute_process(COMMAND conan install ${CMAKE_SOURCE_DIR} --install-folder=${CMAKE_BINARY_DIR} --build missing -s compiler=gcc -s compiler.libcxx=libstdc++11 -s compiler.version=${VERSION} -s os=Windows) diff --git a/conanfile.py b/conanfile.py index dccaadc..65cad76 100644 --- a/conanfile.py +++ b/conanfile.py @@ -12,7 +12,9 @@ class PkmnLibConan(ConanFile): generators = "cmake" exports_sources = "*" compiler = "clang" - requires = "CreatureLib/144d17d859e134c17cdb45c32f4a7e4f68eeb7a0@creaturelib/master" + requires = \ + "CreatureLib/144d17d859e134c17cdb45c32f4a7e4f68eeb7a0@creaturelib/master", \ + "AngelScript/2.34@AngelScript/Deukhoofd" def build(self): cmake = CMake(self)