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 @@
11cmake_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
143if(NOT CMAKE_BUILD_TYPE)
154 set(CMAKE_BUILD_TYPE "Debug" CACHE STRING
165 "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE)
176endif()
187
198if(NOT CMAKE_INSTALL_PREFIX)
20 set(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/stage3" CACHE STRING
9 set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/stage3" CACHE PATH
2110 "Directory to install zig to" FORCE)
2211endif()
2312
......@@ -37,8 +26,16 @@ else()
3726 list(APPEND ZIG_CMAKE_PREFIX_PATH "${ZIG_CMAKE_PREFIX_PATH_STRING}")
3827endif()
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
4340set(ZIG_VERSION_MAJOR 0)
4441set(ZIG_VERSION_MINOR 13)
......@@ -755,6 +752,8 @@ endforeach()
755752
756753# end of zigcpp target
757754
755include(CheckSymbolExists)
756
758757string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" ZIG_HOST_TARGET_OS)
759758if(ZIG_HOST_TARGET_OS STREQUAL "darwin")
760759 set(ZIG_HOST_TARGET_OS "macos")
......@@ -970,11 +969,13 @@ add_custom_target(stage3 ALL
970969 DEPENDS "${PROJECT_BINARY_DIR}/stage3/bin/zig"
971970)
972971
972set(ZIG2_WORKING_DIR "${PROJECT_SOURCE_DIR}")
973
973974add_custom_command(
974975 OUTPUT "${PROJECT_BINARY_DIR}/stage3/bin/zig"
975976 COMMAND zig2 build --prefix "${PROJECT_BINARY_DIR}/stage3" ${ZIG_BUILD_ARGS}
976977 COMMENT STATUS "Building stage3"
977 WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
978 WORKING_DIRECTORY "${ZIG2_WORKING_DIR}"
978979)
979980
980981if(WIN32)
......@@ -985,6 +986,6 @@ endif()
985986
986987install(CODE "set(ZIG_EXECUTABLE \"${ZIG_EXECUTABLE}\")")
987988install(CODE "set(ZIG_BUILD_ARGS \"${ZIG_BUILD_ARGS}\")")
989install(CODE "set(ZIG2_WORKING_DIR \"${ZIG2_WORKING_DIR}\")")
988990install(CODE "set(CMAKE_INSTALL_PREFIX \"${CMAKE_INSTALL_PREFIX}\")")
989install(CODE "set(PROJECT_SOURCE_DIR \"${PROJECT_SOURCE_DIR}\")")
990991install(SCRIPT cmake/install.cmake)
cmake/install.cmake+1-1
......@@ -1,7 +1,7 @@
11set(ZIG_INSTALL_ARGS build --prefix "${CMAKE_INSTALL_PREFIX}" ${ZIG_BUILD_ARGS})
22execute_process(
33 COMMAND "${ZIG_EXECUTABLE}" ${ZIG_INSTALL_ARGS}
4 WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
4 WORKING_DIRECTORY "${ZIG2_WORKING_DIR}"
55 RESULT_VARIABLE _result)
66
77if(_result)