diff options
| author | saturneric <[email protected]> | 2024-01-22 11:09:24 +0000 |
|---|---|---|
| committer | saturneric <[email protected]> | 2024-01-22 11:09:24 +0000 |
| commit | 5b6ccc38e16e6505917d50e3bcc83be26bd34f40 (patch) | |
| tree | 699838a52d541310dd98ac965d36b656c555b1b9 | |
| parent | fix: slove app building problems (diff) | |
| download | GpgFrontend-5b6ccc38e16e6505917d50e3bcc83be26bd34f40.tar.gz GpgFrontend-5b6ccc38e16e6505917d50e3bcc83be26bd34f40.zip | |
fix: solve ci build problems at different platforms
| -rw-r--r-- | CMakeLists.txt | 16 | ||||
| -rw-r--r-- | cmake/FlagsOverrides.cmake | 2 | ||||
| -rw-r--r-- | cmake/FlagsOverridesXcode.cmake | 11 | ||||
| -rw-r--r-- | resource/lfs/app-image/gpgfrontend/com.bktus.gpgfrontend.png | bin | 0 -> 9155 bytes |
4 files changed, 14 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e520a5b9..aba09f9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,18 +26,8 @@ cmake_minimum_required(VERSION 3.16) message(STATUS "Current Generator: ${CMAKE_GENERATOR}") -if(CMAKE_GENERATOR EQUAL "Xcode") - SET (CMAKE_C_FLAGS "-Wall -std=c11") - SET (CMAKE_C_FLAGS_DEBUG "-g") - SET (CMAKE_C_FLAGS_MINSIZERE "-Os -DNDEBUG") - SET (CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG") - SET (CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") - - SET (CMAKE_CXX_FLAGS "-Wall -std=c++17") - SET (CMAKE_CXX_FLAGS_DEBUG "-g") - SET (CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG") - SET (CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG") - SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") +if(CMAKE_GENERATOR STREQUAL "Xcode") + set(CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_SOURCE_DIR}/cmake/FlagsOverridesXcode.cmake") else() set(CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_SOURCE_DIR}/cmake/FlagsOverrides.cmake") endif() @@ -194,7 +184,7 @@ if (NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Release") endif () -if (CMAKE_BUILD_TYPE EQUAL "Release") +if (CMAKE_BUILD_TYPE STREQUAL "Release") add_compile_definitions(RELEASE) else() add_compile_definitions(DEBUG) diff --git a/cmake/FlagsOverrides.cmake b/cmake/FlagsOverrides.cmake index 0ebbd70a..8696c810 100644 --- a/cmake/FlagsOverrides.cmake +++ b/cmake/FlagsOverrides.cmake @@ -1,5 +1,3 @@ -SET (CMAKE_GENERATOR "Ninja") - SET (CMAKE_C_FLAGS "-Wall -std=c11") SET (CMAKE_C_FLAGS_DEBUG "-g -fsanitize=address -fsanitize-recover=address") SET (CMAKE_C_FLAGS_MINSIZERE "-Os -DNDEBUG") diff --git a/cmake/FlagsOverridesXcode.cmake b/cmake/FlagsOverridesXcode.cmake new file mode 100644 index 00000000..e2b00fc9 --- /dev/null +++ b/cmake/FlagsOverridesXcode.cmake @@ -0,0 +1,11 @@ + SET (CMAKE_C_FLAGS "-Wall -std=c11") + SET (CMAKE_C_FLAGS_DEBUG "-g") + SET (CMAKE_C_FLAGS_MINSIZERE "-Os -DNDEBUG") + SET (CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG") + SET (CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g") + + SET (CMAKE_CXX_FLAGS "-Wall -std=c++17") + SET (CMAKE_CXX_FLAGS_DEBUG "-g") + SET (CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG") + SET (CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG") + SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
\ No newline at end of file diff --git a/resource/lfs/app-image/gpgfrontend/com.bktus.gpgfrontend.png b/resource/lfs/app-image/gpgfrontend/com.bktus.gpgfrontend.png Binary files differnew file mode 100644 index 00000000..b3268b01 --- /dev/null +++ b/resource/lfs/app-image/gpgfrontend/com.bktus.gpgfrontend.png |
