From 0b267777bdd2ca16e921141da3e20fe2596f844e Mon Sep 17 00:00:00 2001 From: LiamKeh Date: Thu, 22 Feb 2024 19:35:59 +0800 Subject: [PATCH] modify cmake release or debug --- .github/workflows/cmake-and-release.yml | 20 ++++++++++++-------- examples/CMakeLists.txt | 3 --- examples/app.cmake | 18 +++++++++--------- src/CMakeLists.txt | 3 --- src/lib.cmake | 8 -------- 5 files changed, 21 insertions(+), 31 deletions(-) diff --git a/.github/workflows/cmake-and-release.yml b/.github/workflows/cmake-and-release.yml index c23b53b3..7e12e1dc 100644 --- a/.github/workflows/cmake-and-release.yml +++ b/.github/workflows/cmake-and-release.yml @@ -27,13 +27,14 @@ jobs: run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - name: Create zip - run: zip -r -j gpupixel_linux_x86_64.zip ${{github.workspace}}/output + working-directory: ${{github.workspace}}/output + run: zip -r gpupixel_linux_x86_64.zip . - name: Upload Linux Artifact uses: actions/upload-artifact@v4 with: name: gpupixel_linux_x86_64 - path: ./gpupixel_linux_x86_64.zip + path: ${{github.workspace}}/output/gpupixel_linux_x86_64.zip build-macos-clang: name: macOS (Universal) @@ -52,13 +53,14 @@ jobs: run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - name: Create zip - run: zip -r -j gpupixel_mac_Universal.zip ${{github.workspace}}/output + working-directory: ${{github.workspace}}/output + run: zip -r gpupixel_mac_Universal.zip . - name: Upload Mac Artifact uses: actions/upload-artifact@v4 with: name: gpupixel_mac_Universal - path: ./gpupixel_mac_Universal.zip + path: ${{github.workspace}}/output/gpupixel_mac_Universal.zip build-ios-clang: @@ -78,13 +80,14 @@ jobs: run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - name: Create zip - run: zip -r -j gpupixel_ios_arm64.zip ${{github.workspace}}/output + working-directory: ${{github.workspace}}/output + run: zip -r gpupixel_ios_arm64.zip . - name: Upload iOS Artifact uses: actions/upload-artifact@v4 with: name: gpupixel_ios_arm64 - path: ./gpupixel_ios_arm64.zip + path: ${{github.workspace}}/output/gpupixel_ios_arm64.zip build-windows-mingw: @@ -138,13 +141,14 @@ jobs: run: ./gradlew :gpupixel:assemble - name: Create zip - run: zip -r -j gpupixel_android_arm64_v8a_aar.zip ${{github.workspace}}/src/android/java/gpupixel/build/outputs/aar + working-directory: ${{github.workspace}}/src/android/java/gpupixel/build/outputs/ + run: zip -r gpupixel_android_arm64_v8a_aar.zip . - name: Upload Android Artifact uses: actions/upload-artifact@v4 with: name: gpupixel_android_arm64_v8a_aar - path: ./gpupixel_android_arm64_v8a_aar.zip + path: ${{github.workspace}}/src/android/java/gpupixel/build/outputs/gpupixel_android_arm64_v8a_aar.zip # Deployment job deploy: diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 44e76a5e..24b502fc 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -10,8 +10,5 @@ SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}") SET(APP_PROJECT_NAME "gpupixel_app") PROJECT(${APP_PROJECT_NAME}) -# 定义是否编译 DEBUG 版本(也可以在执行 cmake 指令的时候设置：cmake -DBUILD_DEBUG=ON ..) -SET(BUILD_DEBUG TRUE) - # 引用公用的 cmake 文件 INCLUDE(app) diff --git a/examples/app.cmake b/examples/app.cmake index 652a1530..26ecec18 100644 --- a/examples/app.cmake +++ b/examples/app.cmake @@ -28,17 +28,17 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/rel SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/release) SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/release) -IF(BUILD_DEBUG) +if(CMAKE_BUILD_TYPE STREQUAL "Debug") SET(CMAKE_BUILD_TYPE Debug) LINK_DIRECTORIES(${CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG}) SET(APP_RESOURCE_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}) set(COPY_DST_RUNTIME_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}) -ELSE() +else() SET(CMAKE_BUILD_TYPE Release) LINK_DIRECTORIES(${CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE}) SET(APP_RESOURCE_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}) set(COPY_DST_RUNTIME_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}) -ENDIF(BUILD_DEBUG) +endif() @@ -81,11 +81,11 @@ IF(${CURRENT_OS} STREQUAL "linux") GL glfw) - IF(BUILD_DEBUG) + if(CMAKE_BUILD_TYPE STREQUAL "Debug") SET(GPUPIXEL_LIBS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG}/libgpupixel.so) - ELSE() + else() SET(GPUPIXEL_LIBS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE}/libgpupixel.so) - ENDIF(BUILD_DEBUG) + endif() FIlE(GLOB VNN_LIBS ${CMAKE_CURRENT_SOURCE_DIR}/../src/third_party/vnn/libs/${CURRENT_OS}/* @@ -101,11 +101,11 @@ ELSEIF(${CURRENT_OS} STREQUAL "windows") ${CMAKE_CURRENT_SOURCE_DIR}/../src/third_party/vnn/libs/${CURRENT_OS}/x64/* ) - IF(BUILD_DEBUG) + if(CMAKE_BUILD_TYPE STREQUAL "Debug") SET(GPUPIXEL_LIBS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG}/libgpupixel.dll) - ELSE() + else() SET(GPUPIXEL_LIBS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE}/libgpupixel.dll) - ENDIF(BUILD_DEBUG) + endif() ENDIF() # copy resource file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 68da21c2..ac25374c 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,9 +14,6 @@ SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}") SET(PROJECT_NAME "gpupixel") PROJECT(${PROJECT_NAME}) -# 定义是否编译 DEBUG 版本(也可以在执行 cmake 指令的时候设置：cmake -DBUILD_DEBUG=ON ..) -SET(BUILD_DEBUG TRUE) - # 定义导出 API 的宏定义(Windows下才有意义) ADD_DEFINITIONS(-DMYMATH_EXPORT_LIBRARY) diff --git a/src/lib.cmake b/src/lib.cmake index b26d6d32..ec4aafeb 100644 --- a/src/lib.cmake +++ b/src/lib.cmake @@ -31,14 +31,6 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/rel SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/release) SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/release) - -IF(BUILD_DEBUG) - SET(CMAKE_BUILD_TYPE Debug) -ELSE() - SET(CMAKE_BUILD_TYPE Release) -ENDIF(BUILD_DEBUG) - - # Config source and header file # --------- # header include path