diff options
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/lib/JSONManifestBuilder.cc | 18 |
2 files changed, 3 insertions, 20 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 01284a9..909e9a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,8 @@ # // Copyright (C) 2025, Amlal El Mahrouss, licensed under BSD-3 license. # // ============================================================= // -cmake_minimum_required(VERSION 3.16) +# AMLALE: Update the CMake version, which requires a version that was too old. +cmake_minimum_required(VERSION 4.00) project(nebuild VERSION 0.1 LANGUAGES CXX) @@ -23,6 +24,7 @@ target_include_directories(nebuild PRIVATE ${CMAKE_SOURCE_DIR}/include ${CMAKE_S option(BUILD_WINDOWS "Produce a Windows executable name (nebuild.exe)" OFF) +# Append .exe when it's a Windows build (The Windows loader requires it) if(BUILD_WINDOWS) set_target_properties(nebuild PROPERTIES OUTPUT_NAME "nebuild.exe") endif() @@ -37,7 +39,6 @@ add_custom_target(build-nebuild-windows COMMENT "=> NeBuild built successfully for Windows (configure with -DBUILD_WINDOWS=ON)." ) -message(STATUS "Project: nebuild") message(STATUS "Sources: ${NEBUILD_SOURCES}") message(STATUS "Include dirs: ${CMAKE_SOURCE_DIR}/src;${CMAKE_SOURCE_DIR}/vendor") message(STATUS "To build for Windows-style executable: configure with -DBUILD_WINDOWS=ON") diff --git a/src/lib/JSONManifestBuilder.cc b/src/lib/JSONManifestBuilder.cc index fcb9204..83f1089 100644 --- a/src/lib/JSONManifestBuilder.cc +++ b/src/lib/JSONManifestBuilder.cc @@ -95,24 +95,6 @@ bool JSONManifestBuilder::BuildTarget(BuildConfig& config) { config.has_failed_ = true; return false; } - - // FIXME: segfault. -#if 0 - if (!config.dry_run_) { - auto run_after_build = json_obj["run_after_build"].get<bool>(); - - if (run_after_build) { - ret_exec = std::system(target.c_str()); - - if (ret_exec > 0) { - NeBuild::Logger::info() << "error: exit with message: " << std::strerror(ret_exec) << "" - << std::endl; - config.has_failed_ = true; - return false; - } - } - } -#endif } catch (std::exception& err) { NeBuild::Logger::info() << "error: exit with message: " << err.what() << "" << std::endl; config.has_failed_ = true; |