Skip to content

Commit d709a08

Browse files
committed
Update vendor
1 parent 7c63dce commit d709a08

File tree

22 files changed

+315
-359
lines changed

22 files changed

+315
-359
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "vendor/cpm-cmake-package-lock"]
2+
path = vendor/cpm-cmake-package-lock
3+
url = https://github.com/pqrs-org/cpm-cmake-package-lock.git

.vscode/settings.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"files.exclude": {
33
"**/build/": true,
4-
"**/vendor/cget/": true,
54
".vscode/browse.vc.*": true
65
},
76
"search.exclude": {

README.md

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,4 @@ cpp-cf-string depends the following classes.
1313

1414
## Install
1515

16-
### Using package manager
17-
18-
You can install `include/pqrs` by using [cget](https://github.com/pfultz2/cget).
19-
20-
```shell
21-
cget install pqrs-org/cget-recipes
22-
cget install pqrs-org/cpp-cf-string
23-
```
24-
25-
### Manual install
26-
27-
Copy `include/pqrs` directory into your include directory.
16+
Copy `include/pqrs` and `vendor/vendor/include` directories into your include directory.

example/.gitignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

example/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ add_compile_options(-O2)
99
project (example)
1010

1111
include_directories(${CMAKE_CURRENT_LIST_DIR}/../include)
12-
include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/vendor/include)
12+
include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../vendor/vendor/include)
1313

1414
add_executable(
1515
example

example/Makefile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,3 @@ clean:
99

1010
run:
1111
./build/example
12-
13-
update_vendor:
14-
rm -rf vendor
15-
cget install pqrs-org/cget-recipes --prefix vendor
16-
cget install -f cget-requirements.txt --prefix vendor
17-

example/cget-requirements.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

example/vendor/include/pqrs/cf/cf_ptr.hpp

Lines changed: 0 additions & 1 deletion
This file was deleted.

tests/.gitignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

tests/Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,3 @@ clean:
1212
make -C $$d clean; \
1313
fi; \
1414
done
15-
16-
update_vendor:
17-
rm -rf vendor
18-
cget install pqrs-org/cget-recipes --prefix vendor
19-
cget install -f cget-requirements.txt --prefix vendor

tests/cget-requirements.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

tests/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ add_compile_options(-fsanitize=address)
1010
add_link_options(-fsanitize=address)
1111

1212
include_directories(${CMAKE_CURRENT_LIST_DIR}/../../include)
13-
include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../vendor/include)
13+
include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../../vendor/vendor/include)
1414

1515
project (test)
1616

tests/vendor/cget/pkg/pqrs-org__cpp-cf-cf_ptr/install/include/pqrs/cf/cf_ptr.hpp

Lines changed: 0 additions & 79 deletions
This file was deleted.

tests/vendor/include/boost/ut.hpp

Lines changed: 0 additions & 1 deletion
This file was deleted.

tests/vendor/include/pqrs/cf/cf_ptr.hpp

Lines changed: 0 additions & 1 deletion
This file was deleted.

vendor/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build/

vendor/CMakeLists.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
cmake_minimum_required(VERSION 3.24 FATAL_ERROR)
2+
project(vendor NONE)
3+
4+
include("${CMAKE_CURRENT_LIST_DIR}/cpm-cmake-package-lock/vendor/CPM.cmake")
5+
6+
CPMUsePackageLock("${CMAKE_CURRENT_LIST_DIR}/cpm-cmake-package-lock/cmake/package-lock.cmake")
7+
8+
set(VENDOR_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/vendor")
9+
file(MAKE_DIRECTORY "${VENDOR_INCLUDE_DIR}")
10+
11+
include("${CMAKE_CURRENT_LIST_DIR}/cpm-cmake-package-lock/cmake/common.cmake")
12+
include("${CMAKE_CURRENT_LIST_DIR}/cpm-cmake-package-lock/cmake/dependency.cmake")
13+
14+
copy_vendor_package(pqrs_cf_cf_ptr)
15+
copy_vendor_package(ut)

vendor/Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
all:
2+
rm -fr vendor
3+
cmake -S . -B build
4+
cmake --build build
5+
6+
clean:
7+
rm -fr build vendor

vendor/cpm-cmake-package-lock

Submodule cpm-cmake-package-lock added at b834502

vendor/vendor/include/boost/ut.cppm

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
module;
2+
3+
#if __has_include(<unistd.h>) and __has_include(<sys/wait.h>)
4+
#include <sys/wait.h>
5+
#include <unistd.h>
6+
#endif
7+
8+
export module boost.ut;
9+
export import std;
10+
11+
#define BOOST_UT_CXX_MODULES 1
12+
#include "ut.hpp"

0 commit comments

Comments
 (0)