From d6f8ca9a2e14e74af0cf2561d26c00a0484ddd0b Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Wed, 12 Oct 2022 23:17:05 -0400 Subject: [PATCH] Patch out the install for argparse --- bitmap2component/CMakeLists.txt | 1 - common/CMakeLists.txt | 2 +- gerbview/CMakeLists.txt | 1 - pagelayout_editor/CMakeLists.txt | 1 - pcb_calculator/CMakeLists.txt | 1 - thirdparty/argparse/CMakeLists.txt | 63 +----------------------------- 6 files changed, 3 insertions(+), 66 deletions(-) diff --git a/bitmap2component/CMakeLists.txt b/bitmap2component/CMakeLists.txt index 078f31f179..3b45e9d348 100644 --- a/bitmap2component/CMakeLists.txt +++ b/bitmap2component/CMakeLists.txt @@ -53,7 +53,6 @@ add_executable( bitmap2component WIN32 MACOSX_BUNDLE target_link_libraries( bitmap2component common - argparse::argparse ${wxWidgets_LIBRARIES} potrace ) diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 53a9e0f1b2..5f9d137d98 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -487,7 +487,6 @@ target_link_libraries( common compoundfilereader pcm_settings nanodbc # for now; maybe hoist out of common - argparse::argparse ${Boost_LIBRARIES} ${CURL_LIBRARIES} ${wxWidgets_LIBRARIES} @@ -508,6 +507,7 @@ target_include_directories( common . ${CMAKE_BINARY_DIR} $ + $ ) # text markup support diff --git a/gerbview/CMakeLists.txt b/gerbview/CMakeLists.txt index fb658c69a8..d21fbc0868 100644 --- a/gerbview/CMakeLists.txt +++ b/gerbview/CMakeLists.txt @@ -112,7 +112,6 @@ target_link_libraries( gerbview gal common nlohmann_json - argparse::argparse ${wxWidgets_LIBRARIES} ) diff --git a/pagelayout_editor/CMakeLists.txt b/pagelayout_editor/CMakeLists.txt index 72ce38fde7..5f503d479e 100644 --- a/pagelayout_editor/CMakeLists.txt +++ b/pagelayout_editor/CMakeLists.txt @@ -85,7 +85,6 @@ target_link_libraries( pl_editor # There's way too much crap coming in from common yet. gal common - argparse::argparse ${wxWidgets_LIBRARIES} ) diff --git a/pcb_calculator/CMakeLists.txt b/pcb_calculator/CMakeLists.txt index e4ca0b9607..f58e348d27 100644 --- a/pcb_calculator/CMakeLists.txt +++ b/pcb_calculator/CMakeLists.txt @@ -90,7 +90,6 @@ target_link_libraries( pcb_calculator #singletop # replaces common, giving us restrictive control and link warnings. # There's way too much crap coming in from common yet. common - argparse::argparse ${wxWidgets_LIBRARIES} ) diff --git a/thirdparty/argparse/CMakeLists.txt b/thirdparty/argparse/CMakeLists.txt index cb359d5fca..20579177a8 100644 --- a/thirdparty/argparse/CMakeLists.txt +++ b/thirdparty/argparse/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.12.4) project(argparse - VERSION 2.9.0 + VERSION 2.9.0 DESCRIPTION "A single header argument parser for C++17" HOMEPAGE_URL "https://github.com/p-ranav/argparse" LANGUAGES CXX @@ -36,63 +36,4 @@ if(ARGPARSE_BUILD_TESTS) add_subdirectory(test) endif() -install(TARGETS argparse EXPORT argparseConfig) -install(EXPORT argparseConfig - NAMESPACE argparse:: - DESTINATION ${CMAKE_INSTALL_LIBDIR_ARCHIND}/cmake/${PROJECT_NAME}) -install(FILES ${CMAKE_CURRENT_LIST_DIR}/include/argparse/argparse.hpp - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/argparse) - - -set(CONFIG_FILE_NAME_WITHOUT_EXT "${PROJECT_NAME}Config") -set(CMAKE_CONFIG_FILE_BASENAME "${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_FILE_NAME_WITHOUT_EXT}") -set(CMAKE_CONFIG_VERSION_FILE_NAME "${CMAKE_CONFIG_FILE_BASENAME}-version.cmake") -set(CMAKE_CONFIG_FILE_NAME "${CMAKE_CONFIG_FILE_BASENAME}.cmake") - -if(${CMAKE_VERSION} VERSION_GREATER "3.14") - set(OPTIONAL_ARCH_INDEPENDENT "ARCH_INDEPENDENT") -endif() - -write_basic_package_version_file("${CMAKE_CONFIG_VERSION_FILE_NAME}" - COMPATIBILITY ExactVersion - ${OPTIONAL_ARCH_INDEPENDENT} -) - -export(EXPORT argparseConfig - NAMESPACE argparse::) - -install(FILES "${CMAKE_CONFIG_VERSION_FILE_NAME}" - DESTINATION "${CMAKE_INSTALL_LIBDIR_ARCHIND}/cmake/${PROJECT_NAME}") - -set(PackagingTemplatesDir "${CMAKE_CURRENT_SOURCE_DIR}/packaging") - -set(CPACK_PACKAGE_NAME "${PROJECT_NAME}") -set(CPACK_PACKAGE_VENDOR "argparse (C++) developers") -set(CPACK_PACKAGE_DESCRIPTION "${PROJECT_DESCRIPTION}") -set(CPACK_DEBIAN_PACKAGE_NAME "${CPACK_PACKAGE_NAME}") -set(CPACK_RPM_PACKAGE_NAME "${CPACK_PACKAGE_NAME}") -set(CPACK_PACKAGE_HOMEPAGE_URL "${PROJECT_HOMEPAGE_URL}") -set(CPACK_PACKAGE_MAINTAINER "Pranav Srinivas Kumar") -set(CPACK_DEBIAN_PACKAGE_MAINTAINER "${CPACK_PACKAGE_MAINTAINER}") -set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") -set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md") - -set(CPACK_DEBIAN_PACKAGE_NAME "lib${PROJECT_NAME}-dev") -set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6-dev") -set(CPACK_DEBIAN_PACKAGE_SUGGESTS "cmake, pkg-config, pkg-conf") - -set(CPACK_RPM_PACKAGE_NAME "lib${PROJECT_NAME}-devel") -set(CPACK_RPM_PACKAGE_SUGGESTS "${CPACK_DEBIAN_PACKAGE_SUGGESTS}") - -set(CPACK_DEB_COMPONENT_INSTALL ON) -set(CPACK_RPM_COMPONENT_INSTALL ON) -set(CPACK_NSIS_COMPONENT_INSTALL ON) -set(CPACK_DEBIAN_COMPRESSION_TYPE "xz") - -set(PKG_CONFIG_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc") -configure_file("${PackagingTemplatesDir}/pkgconfig.pc.in" "${PKG_CONFIG_FILE_NAME}" @ONLY) -install(FILES "${PKG_CONFIG_FILE_NAME}" - DESTINATION "${CMAKE_INSTALL_LIBDIR_ARCHIND}/pkgconfig" -) - -include(CPack) +## Modified to remove undesirable install steps \ No newline at end of file