From 5488a8da20aba5a375b2eb637dccf2cedc479735 Mon Sep 17 00:00:00 2001
From: halx99 <halx99@live.com>
Date: Mon, 15 Mar 2021 09:50:32 +0800
Subject: [PATCH] Fix CMakeLists for separating test projects [ci build]

---
 tests/fairygui-tests/CMakeLists.txt    | 2 +-
 tests/lua-tests/project/CMakeLists.txt | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/fairygui-tests/CMakeLists.txt b/tests/fairygui-tests/CMakeLists.txt
index bfb1e963b8..1cf608f448 100644
--- a/tests/fairygui-tests/CMakeLists.txt
+++ b/tests/fairygui-tests/CMakeLists.txt
@@ -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()
diff --git a/tests/lua-tests/project/CMakeLists.txt b/tests/lua-tests/project/CMakeLists.txt
index 153ce7d15a..2c1f443ba1 100644
--- a/tests/lua-tests/project/CMakeLists.txt
+++ b/tests/lua-tests/project/CMakeLists.txt
@@ -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()