Update CMakeLists.txt

This commit is contained in:
James Chen 2014-03-11 17:52:28 +08:00
parent cbd9cbaf71
commit 6ad4b191a6
1 changed files with 14 additions and 10 deletions

View File

@ -46,8 +46,8 @@ option(BUILD_EDITOR_SPINE "Build editor support for spine" ON)
option(BUILD_EDITOR_COCOSTUDIO "Build editor support for cocostudio" ON) option(BUILD_EDITOR_COCOSTUDIO "Build editor support for cocostudio" ON)
option(BUILD_EDITOR_COCOSBUILDER "Build editor support for cocosbuilder" ON) option(BUILD_EDITOR_COCOSBUILDER "Build editor support for cocosbuilder" ON)
option(BUILD_TestCpp "Only build TestCpp sample" ON) option(BUILD_CppTests "Only build TestCpp sample" ON)
option(BUILD_TestLua "Only build TestLua sample" OFF) option(BUILD_LuaTests "Only build TestLua sample" OFF)
else()#temp else()#temp
option(USE_CHIPMUNK "Use chipmunk for physics library" ON) option(USE_CHIPMUNK "Use chipmunk for physics library" ON)
@ -62,8 +62,8 @@ option(BUILD_EDITOR_SPINE "Build editor support for spine" ON)
option(BUILD_EDITOR_COCOSTUDIO "Build editor support for cocostudio" ON) option(BUILD_EDITOR_COCOSTUDIO "Build editor support for cocostudio" ON)
option(BUILD_EDITOR_COCOSBUILDER "Build editor support for cocosbuilder" ON) option(BUILD_EDITOR_COCOSBUILDER "Build editor support for cocosbuilder" ON)
option(BUILD_TestCpp "Only build TestCpp sample" ON) option(BUILD_CppTests "Only build TestCpp sample" ON)
option(BUILD_TestLua "Only build TestLua sample" ON) option(BUILD_LuaTests "Only build TestLua sample" ON)
endif()#temp endif()#temp
@ -289,10 +289,14 @@ endif(BUILD_LIBS_LUA)
# build tests # build tests
if(BUILD_TestCpp) add_subdirectory(tests/cpp-empty-test)
add_subdirectory(samples/cpp-tests)
endif(BUILD_TestCpp)
if(BUILD_TestLua) if(BUILD_CppTests)
add_subdirectory(samples/lua-tests/project) add_subdirectory(tests/cpp-tests)
endif(BUILD_TestLua) endif(BUILD_CppTests)
add_subdirectory(tests/lua-empty-test)
if(BUILD_LuaTests)
add_subdirectory(tests/lua-tests/project)
endif(BUILD_LuaTests)