From f3f025b9c91e262f1b7a3df13e670a5ce579c8f3 Mon Sep 17 00:00:00 2001 From: ado Date: Sun, 7 Feb 2021 12:45:28 +0100 Subject: [PATCH 1/2] remove install option --- CMakeLists.txt | 46 ---------------------------------------------- README.md | 8 -------- 2 files changed, 54 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 323c897..b1f27d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,49 +47,3 @@ target_link_libraries( "$<$,$,9.0>>:c++fs>" "$<$,$,9.1>>:stdc++fs>" ) - -# ---- Install ---- - -include(CMakePackageConfigHelpers) -include(GNUInstallDirs) - -set(ssp_directory "ssp-${PROJECT_VERSION}") -set(ssp_include_directory "${CMAKE_INSTALL_INCLUDEDIR}") - -install( - DIRECTORY "${PROJECT_SOURCE_DIR}/include/" - DESTINATION "${ssp_include_directory}" - COMPONENT ssp_Development -) - -install( - TARGETS ssp - EXPORT sspTargets - INCLUDES DESTINATION "${ssp_include_directory}" -) - -write_basic_package_version_file( - ssp-config-version.cmake - COMPATIBILITY SameMajorVersion - ARCH_INDEPENDENT -) - -set(ssp_install_cmakedir "${CMAKE_INSTALL_LIBDIR}/cmake/${ssp_directory}") - -install( - FILES "${PROJECT_BINARY_DIR}/ssp-config-version.cmake" - DESTINATION "${ssp_install_cmakedir}" - COMPONENT ssp_Development -) - -install( - EXPORT sspTargets - FILE ssp-config.cmake - NAMESPACE ssp:: - DESTINATION "${ssp_install_cmakedir}" - COMPONENT ssp_Development -) - -if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - include(CPack) -endif() diff --git a/README.md b/README.md index 7aebfba..41968cb 100644 --- a/README.md +++ b/README.md @@ -59,14 +59,6 @@ Bill (Heath) Gates 65 3.3 * Conversions can be chained if invalid * Fast -# Installation - -``` -$ git clone https://github.com/red0124/ssp -$ cd ssp -$ cmake --configure . -$ sudo make install -``` # Usage ## Conversions From 613cc2b98a8d6b7fb61c6dc12cb5278be8d8a283 Mon Sep 17 00:00:00 2001 From: ado Date: Sun, 7 Feb 2021 13:02:35 +0100 Subject: [PATCH 2/2] disable tests if subproject in meson --- meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 4ff7542..b1624e1 100644 --- a/meson.build +++ b/meson.build @@ -12,4 +12,6 @@ ssp_dep = declare_dependency( dependencies: fast_float_dep ) -subdir('test') +if not meson.is_subproject() + subdir('test') +endif