test

.github/workflows/build-windows.yml

@@ -29,13 +29,6 @@ jobs:
         #name: PATH
         #value: $PATH;${{github.workspace}}/zbin/glistzbin-win64/clang64/bin;${{github.workspace}}/zbin/glistzbin-win64/CMake/bin
 
-    - name: Move project
-      run: |
-        ls ${{github.workspace}}
-        mv ${{github.workspace}}/ public/myglistapps/${{github.repository}}/
-        ls -l public/myglistapps/${{github.repository}}
-        ls ${{github.workspace}}
-
     - name: cd engine
       run: |
         mkdir ${{github.workspace}}/engine
@@ -74,7 +67,7 @@ jobs:
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=${{github.workspace}}/zbin/glistzbin-win64/clang64/bin/clang.exe -DCMAKE_CXX_COMPILER=${{github.workspace}}/zbin/glistzbin-win64/clang64/bin/clang++.exe -DTOP_DIR=${{github.workspace}}
 
     - name: Build
       # Build your program with the given configuration

CMakeLists.txt

@@ -25,8 +25,12 @@ endif()
 # Clang compiler definition for Windows. Do not change this value for other OS.
 # For UNIX like systems, configure the compiler via OS commands.
 if(WIN32)
-	set(CMAKE_C_COMPILER "${CMAKE_SOURCE_DIR}/../../zbin/glistzbin-win64/clang64/bin/clang.exe")
-	set(CMAKE_CXX_COMPILER "${CMAKE_SOURCE_DIR}/../../zbin/glistzbin-win64/clang64/bin/clang++.exe")
+    if(NOT DEFINED CMAKE_C_COMPILER)
+    	set(CMAKE_C_COMPILER "${CMAKE_SOURCE_DIR}/../../zbin/glistzbin-win64/clang64/bin/clang.exe")
+    endif()
+    if(NOT DEFINED CMAKE_CXX_COMPILER)
+    	set(CMAKE_CXX_COMPILER "${CMAKE_SOURCE_DIR}/../../zbin/glistzbin-win64/clang64/bin/clang++.exe")
+    endif()
 endif(WIN32)
 
 
@@ -65,7 +69,9 @@ set(APP_DIR ${CMAKE_SOURCE_DIR})
 project (${APP_NAME})
 set(CMAKE_BUILD_TYPE Debug)
 
-set(TOP_DIR ${APP_DIR}/../..)
+if(NOT DEFINED)
+    set(TOP_DIR ${APP_DIR}/../..)
+endif()
 set(MAIN_DIR ${TOP_DIR}/GlistEngine)
 set(ENGINE_DIR ${MAIN_DIR}/engine)