Skip to content

Commit b136b56

Browse files
authored
increase cmake stability , remove tests/CMakeLists.txt (#19261)
1 parent c6224d1 commit b136b56

File tree

2 files changed

+8
-42
lines changed

2 files changed

+8
-42
lines changed

CMakeLists.txt

+8-1
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,12 @@ set(BUILD_LUA_LIBS ON)
4646
set(BUILD_JS_LIBS ON)
4747

4848
add_subdirectory(${COCOS2DX_ROOT_PATH}/cocos ${ENGINE_BINARY_PATH}/cocos/core)
49-
add_subdirectory(${COCOS2DX_ROOT_PATH}/tests ${ENGINE_BINARY_PATH}/tests)
5049

50+
# prevent tests project to build "cocos2d-x/cocos" again
51+
set(BUILD_ENGINE_DONE ON)
52+
# add engine all tests project
53+
add_subdirectory(${COCOS2DX_ROOT_PATH}/tests/cpp-empty-test ${ENGINE_BINARY_PATH}/tests/cpp-empty-test)
54+
add_subdirectory(${COCOS2DX_ROOT_PATH}/tests/cpp-tests ${ENGINE_BINARY_PATH}/tests/cpp-tests)
55+
add_subdirectory(${COCOS2DX_ROOT_PATH}/tests/js-tests/project ${ENGINE_BINARY_PATH}/tests/js-tests)
56+
add_subdirectory(${COCOS2DX_ROOT_PATH}/tests/lua-empty-test/project ${ENGINE_BINARY_PATH}/tests/lua-empty-test)
57+
add_subdirectory(${COCOS2DX_ROOT_PATH}/tests/lua-tests/project ${ENGINE_BINARY_PATH}/tests/lua-test)

tests/CMakeLists.txt

-41
This file was deleted.

0 commit comments

Comments
 (0)