Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix CMakeLists for separating test projects [ci build]

This commit is contained in:
halx99 2021-03-15 09:50:32 +08:00
parent 4f0f713977
commit 5488a8da20
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/fairygui-tests/CMakeLists.txt
View File

@ -34,7 +34,7 @@ if(NOT DEFINED BUILD_ENGINE_DONE)
endif()
if(NOT (ENGINEX_ROOT STREQUAL ""))
set(COCOS2DX_ROOT_PATH "$ENV{COCOS2DX_ROOT}")
set(COCOS2DX_ROOT_PATH "${ENGINEX_ROOT}")
file(TO_CMAKE_PATH ${COCOS2DX_ROOT_PATH} COCOS2DX_ROOT_PATH) # string(REPLACE "\\" "/" COCOS2DX_ROOT_PATH ${COCOS2DX_ROOT_PATH})
message(STATUS "Using system env var ENGINEX_ROOT=${ENGINEX_ROOT}")
else()

8
tests/lua-tests/project/CMakeLists.txt
View File

@ -11,7 +11,7 @@ if(NOT DEFINED BUILD_ENGINE_DONE)
endif()
if(NOT (ENGINEX_ROOT STREQUAL ""))
set(COCOS2DX_ROOT_PATH "$ENV{COCOS2DX_ROOT}")
set(COCOS2DX_ROOT_PATH "${ENGINEX_ROOT}")
file(TO_CMAKE_PATH ${COCOS2DX_ROOT_PATH} COCOS2DX_ROOT_PATH) # string(REPLACE "\\" "/" COCOS2DX_ROOT_PATH ${COCOS2DX_ROOT_PATH})
message(STATUS "Using system env var ENGINEX_ROOT=${ENGINEX_ROOT}")
else()
@ -145,7 +145,7 @@ endif()
if(LINUX OR WINDOWS)
cocos_get_resource_path(APP_RES_DIR ${APP_NAME})
cocos_copy_target_res(${APP_NAME} LINK_TO ${APP_RES_DIR}/res FOLDERS ${res_res_folders})
cocos_copy_lua_scripts(${APP_NAME} ${res_src_folders} ${APP_RES_DIR}/src )
cocos_copy_lua_scripts(${APP_NAME} ${res_script_folders} ${APP_RES_DIR}/src/cocos)
# cocos_copy_target_res(${APP_NAME} LINK_TO ${APP_RES_DIR}/res FOLDERS ${res_res_folders})
# cocos_copy_lua_scripts(${APP_NAME} ${res_src_folders} ${APP_RES_DIR}/src )
# cocos_copy_lua_scripts(${APP_NAME} ${res_script_folders} ${APP_RES_DIR}/src/cocos)
endif()