ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Using system angelscript must now be explicitely requested through an option, shouldn't be enabled by default as this will mostly lead to build errors due to finding a different version

Browse Source
This commit is contained in:
Marianne Gagnon 2015-06-15 18:46:06 -04:00
parent edbb6892e0
commit f651321ceb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -18,6 +18,7 @@ endif()
option(USE_WIIUSE "Support for wiimote input devices" ON) option(USE_WIIUSE "Support for wiimote input devices" ON)
option(USE_FRIBIDI "Support for right-to-left languages" ON) option(USE_FRIBIDI "Support for right-to-left languages" ON)
option(CHECK_ASSETS "Check if assets are installed in ../stk-assets" ON) option(CHECK_ASSETS "Check if assets are installed in ../stk-assets" ON)
option(USE_SYSTEM_ANGELSCRIPT "Use system angelscript instead of built-in angelscript. If you enable this option, make sure to use a compatible version." OFF)
if(MSVC) if(MSVC)
# Normally hide the option to build wiiuse on VS, since it depends # Normally hide the option to build wiiuse on VS, since it depends
@ -123,7 +124,7 @@ endif()
# Build the angelscript library if not in system # Build the angelscript library if not in system
find_package(Angelscript) find_package(Angelscript)
if(ANGELSCRIPT_FOUND) if(USE_SYSTEM_ANGELSCRIPT AND ANGELSCRIPT_FOUND)
include_directories(${Angelscript_INCLUDE_DIRS}) include_directories(${Angelscript_INCLUDE_DIRS})
else() else()
add_subdirectory("${PROJECT_SOURCE_DIR}/lib/angelscript/projects/cmake") add_subdirectory("${PROJECT_SOURCE_DIR}/lib/angelscript/projects/cmake")