From 1b7ade99be84e314e807a0b07634a3116c004a47 Mon Sep 17 00:00:00 2001 From: Patrick Brosi Date: Tue, 10 Oct 2023 13:10:34 +0200 Subject: [PATCH] bump minimum required cmake version, dont hardcode build path to build in CMakeLists.txt, update pfxml --- CMakeLists.txt | 16 +++++++--------- src/xml | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e86646..eb0e471 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,13 +1,11 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) project (pfaedle) if (CMAKE_BUILD_TYPE) - string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE) -endif() -if (CMAKE_BUILD_TYPE STREQUAL "DEBUG") - set(CPPLINT "${CMAKE_SOURCE_DIR}/cpplint.py") - include(cmake/cpplint.cmake) + string(SUBSTRING ${CMAKE_BUILD_TYPE} 0 1 FIRST_CHAR) + string(TOUPPER ${FIRST_CHAR} FIRST_CHAR) + string(REGEX REPLACE "^.(.*)" "${FIRST_CHAR}\\1" CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}") endif() set(CPPLINT_PROJECT_ROOT "src") @@ -15,7 +13,7 @@ set(CPPLINT_PROJECT_ROOT "src") enable_testing() set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/") -set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/build") +set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}") # set compiler flags, see http://stackoverflow.com/questions/7724569/debug-vs-release-in-cmake set(CMAKE_CXX_FLAGS "-Ofast -fno-signed-zeros -fno-trapping-math -Wall -Wno-format-extra-args -Wextra -Wformat-nonliteral -Wformat-security -Wformat=2 -Wextra -Wno-implicit-fallthrough -pedantic -Wno-keyword-macro") @@ -98,11 +96,11 @@ install( ) install( - FILES build/pfaedle DESTINATION bin + FILES ${CMAKE_BINARY_DIR}/pfaedle DESTINATION bin PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE COMPONENT binaries ) install( - FILES build/shapevl DESTINATION bin + FILES ${CMAKE_BINARY_DIR}/shapevl DESTINATION bin PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE COMPONENT binaries ) diff --git a/src/xml b/src/xml index 33b9906..d6acc51 160000 --- a/src/xml +++ b/src/xml @@ -1 +1 @@ -Subproject commit 33b990689fbf1bb69c782460ecc8bcced2997639 +Subproject commit d6acc51dda15e0d955140b50735840bb0fae6c71