authorgravatar for bratishkaerik@landless-city.netEric Joldasov <bratishkaerik@landless-city.net> 2024-05-15 14:03:48+05:00
committergravatar for bratishkaerik@landless-city.netEric Joldasov <bratishkaerik@landless-city.net> 2024-05-15 15:37:12+05:00
log1e785984b0d366cdf855cff7cc00005e3e43afe2
tree9398c49f3f430d28a722c3a7a5926b41badab9f6
parent1079b5fe63abeaf716baeddc731204927e322643
signaturelock-open Commit is signed but in an unrecognized format.

CMake: try to fix CI failures

Signed-off-by: Eric Joldasov <bratishkaerik@landless-city.net>

2 files changed, 17 insertions(+), 16 deletions(-)

CMakeLists.txt+16-15
...@@ -1,23 +1,12 @@...@@ -1,23 +1,12 @@
1cmake_minimum_required(VERSION 3.15)1cmake_minimum_required(VERSION 3.15)
22
3project(zig
4 DESCRIPTION
5 "Zig is a general-purpose programming language and toolchain for maintaining robust, optimal and reusable software"
6 HOMEPAGE_URL
7 "https://ziglang.org"
8 LANGUAGES
9 C CXX
10)
11
12include(CheckSymbolExists)
13
14if(NOT CMAKE_BUILD_TYPE)3if(NOT CMAKE_BUILD_TYPE)
15 set(CMAKE_BUILD_TYPE "Debug" CACHE STRING4 set(CMAKE_BUILD_TYPE "Debug" CACHE STRING
16 "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE)5 "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE)
17endif()6endif()
187
19if(NOT CMAKE_INSTALL_PREFIX)8if(NOT CMAKE_INSTALL_PREFIX)
20 set(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/stage3" CACHE STRING9 set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/stage3" CACHE PATH
21 "Directory to install zig to" FORCE)10 "Directory to install zig to" FORCE)
22endif()11endif()
2312
...@@ -37,8 +26,16 @@ else()...@@ -37,8 +26,16 @@ else()
37 list(APPEND ZIG_CMAKE_PREFIX_PATH "${ZIG_CMAKE_PREFIX_PATH_STRING}")26 list(APPEND ZIG_CMAKE_PREFIX_PATH "${ZIG_CMAKE_PREFIX_PATH_STRING}")
38endif()27endif()
3928
29list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
4030
41list(PREPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")31project(zig
32 DESCRIPTION
33 "Zig is a general-purpose programming language and toolchain for maintaining robust, optimal and reusable software"
34 HOMEPAGE_URL
35 "https://ziglang.org"
36 LANGUAGES
37 C CXX
38)
4239
43set(ZIG_VERSION_MAJOR 0)40set(ZIG_VERSION_MAJOR 0)
44set(ZIG_VERSION_MINOR 13)41set(ZIG_VERSION_MINOR 13)
...@@ -755,6 +752,8 @@ endforeach()...@@ -755,6 +752,8 @@ endforeach()
755752
756# end of zigcpp target753# end of zigcpp target
757754
755include(CheckSymbolExists)
756
758string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" ZIG_HOST_TARGET_OS)757string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" ZIG_HOST_TARGET_OS)
759if(ZIG_HOST_TARGET_OS STREQUAL "darwin")758if(ZIG_HOST_TARGET_OS STREQUAL "darwin")
760 set(ZIG_HOST_TARGET_OS "macos")759 set(ZIG_HOST_TARGET_OS "macos")
...@@ -970,11 +969,13 @@ add_custom_target(stage3 ALL...@@ -970,11 +969,13 @@ add_custom_target(stage3 ALL
970 DEPENDS "${PROJECT_BINARY_DIR}/stage3/bin/zig"969 DEPENDS "${PROJECT_BINARY_DIR}/stage3/bin/zig"
971)970)
972971
972set(ZIG2_WORKING_DIR "${PROJECT_SOURCE_DIR}")
973
973add_custom_command(974add_custom_command(
974 OUTPUT "${PROJECT_BINARY_DIR}/stage3/bin/zig"975 OUTPUT "${PROJECT_BINARY_DIR}/stage3/bin/zig"
975 COMMAND zig2 build --prefix "${PROJECT_BINARY_DIR}/stage3" ${ZIG_BUILD_ARGS}976 COMMAND zig2 build --prefix "${PROJECT_BINARY_DIR}/stage3" ${ZIG_BUILD_ARGS}
976 COMMENT STATUS "Building stage3"977 COMMENT STATUS "Building stage3"
977 WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"978 WORKING_DIRECTORY "${ZIG2_WORKING_DIR}"
978)979)
979980
980if(WIN32)981if(WIN32)
...@@ -985,6 +986,6 @@ endif()...@@ -985,6 +986,6 @@ endif()
985986
986install(CODE "set(ZIG_EXECUTABLE \"${ZIG_EXECUTABLE}\")")987install(CODE "set(ZIG_EXECUTABLE \"${ZIG_EXECUTABLE}\")")
987install(CODE "set(ZIG_BUILD_ARGS \"${ZIG_BUILD_ARGS}\")")988install(CODE "set(ZIG_BUILD_ARGS \"${ZIG_BUILD_ARGS}\")")
989install(CODE "set(ZIG2_WORKING_DIR \"${ZIG2_WORKING_DIR}\")")
988install(CODE "set(CMAKE_INSTALL_PREFIX \"${CMAKE_INSTALL_PREFIX}\")")990install(CODE "set(CMAKE_INSTALL_PREFIX \"${CMAKE_INSTALL_PREFIX}\")")
989install(CODE "set(PROJECT_SOURCE_DIR \"${PROJECT_SOURCE_DIR}\")")
990install(SCRIPT cmake/install.cmake)991install(SCRIPT cmake/install.cmake)
cmake/install.cmake+1-1
...@@ -1,7 +1,7 @@...@@ -1,7 +1,7 @@
1set(ZIG_INSTALL_ARGS build --prefix "${CMAKE_INSTALL_PREFIX}" ${ZIG_BUILD_ARGS})1set(ZIG_INSTALL_ARGS build --prefix "${CMAKE_INSTALL_PREFIX}" ${ZIG_BUILD_ARGS})
2execute_process(2execute_process(
3 COMMAND "${ZIG_EXECUTABLE}" ${ZIG_INSTALL_ARGS}3 COMMAND "${ZIG_EXECUTABLE}" ${ZIG_INSTALL_ARGS}
4 WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"4 WORKING_DIRECTORY "${ZIG2_WORKING_DIR}"
5 RESULT_VARIABLE _result)5 RESULT_VARIABLE _result)
66
7if(_result)7if(_result)