Patch out the install for argparse
This commit is contained in:
parent
8b9cbd5805
commit
d6f8ca9a2e
|
@ -53,7 +53,6 @@ add_executable( bitmap2component WIN32 MACOSX_BUNDLE
|
||||||
|
|
||||||
target_link_libraries( bitmap2component
|
target_link_libraries( bitmap2component
|
||||||
common
|
common
|
||||||
argparse::argparse
|
|
||||||
${wxWidgets_LIBRARIES}
|
${wxWidgets_LIBRARIES}
|
||||||
potrace
|
potrace
|
||||||
)
|
)
|
||||||
|
|
|
@ -487,7 +487,6 @@ target_link_libraries( common
|
||||||
compoundfilereader
|
compoundfilereader
|
||||||
pcm_settings
|
pcm_settings
|
||||||
nanodbc # for now; maybe hoist out of common
|
nanodbc # for now; maybe hoist out of common
|
||||||
argparse::argparse
|
|
||||||
${Boost_LIBRARIES}
|
${Boost_LIBRARIES}
|
||||||
${CURL_LIBRARIES}
|
${CURL_LIBRARIES}
|
||||||
${wxWidgets_LIBRARIES}
|
${wxWidgets_LIBRARIES}
|
||||||
|
@ -508,6 +507,7 @@ target_include_directories( common
|
||||||
.
|
.
|
||||||
${CMAKE_BINARY_DIR}
|
${CMAKE_BINARY_DIR}
|
||||||
$<TARGET_PROPERTY:thread-pool,INTERFACE_INCLUDE_DIRECTORIES>
|
$<TARGET_PROPERTY:thread-pool,INTERFACE_INCLUDE_DIRECTORIES>
|
||||||
|
$<TARGET_PROPERTY:argparse::argparse,INTERFACE_INCLUDE_DIRECTORIES>
|
||||||
)
|
)
|
||||||
|
|
||||||
# text markup support
|
# text markup support
|
||||||
|
|
|
@ -112,7 +112,6 @@ target_link_libraries( gerbview
|
||||||
gal
|
gal
|
||||||
common
|
common
|
||||||
nlohmann_json
|
nlohmann_json
|
||||||
argparse::argparse
|
|
||||||
${wxWidgets_LIBRARIES}
|
${wxWidgets_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -85,7 +85,6 @@ target_link_libraries( pl_editor
|
||||||
# There's way too much crap coming in from common yet.
|
# There's way too much crap coming in from common yet.
|
||||||
gal
|
gal
|
||||||
common
|
common
|
||||||
argparse::argparse
|
|
||||||
${wxWidgets_LIBRARIES}
|
${wxWidgets_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -90,7 +90,6 @@ target_link_libraries( pcb_calculator
|
||||||
#singletop # replaces common, giving us restrictive control and link warnings.
|
#singletop # replaces common, giving us restrictive control and link warnings.
|
||||||
# There's way too much crap coming in from common yet.
|
# There's way too much crap coming in from common yet.
|
||||||
common
|
common
|
||||||
argparse::argparse
|
|
||||||
${wxWidgets_LIBRARIES}
|
${wxWidgets_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
cmake_minimum_required(VERSION 3.12.4)
|
cmake_minimum_required(VERSION 3.12.4)
|
||||||
|
|
||||||
project(argparse
|
project(argparse
|
||||||
VERSION 2.9.0
|
VERSION 2.9.0
|
||||||
DESCRIPTION "A single header argument parser for C++17"
|
DESCRIPTION "A single header argument parser for C++17"
|
||||||
HOMEPAGE_URL "https://github.com/p-ranav/argparse"
|
HOMEPAGE_URL "https://github.com/p-ranav/argparse"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
|
@ -36,63 +36,4 @@ if(ARGPARSE_BUILD_TESTS)
|
||||||
add_subdirectory(test)
|
add_subdirectory(test)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
install(TARGETS argparse EXPORT argparseConfig)
|
## Modified to remove undesirable install steps
|
||||||
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)
|
|
Loading…
Reference in New Issue