Skip to content

Commit f92d009

Browse files
committed
Update vendor
1 parent f4b592a commit f92d009

File tree

296 files changed

+1441
-4867
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

296 files changed

+1441
-4867
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: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,9 @@ Call slots when Input Source is changed.
1010
cpp-osx-input_source_selector depends the following classes.
1111

1212
- [pqrs::dispatcher](https://github.com/pqrs-org/cpp-dispatcher)
13+
- [pqrs::json](https://github.com/pqrs-org/cpp-json)
1314
- [pqrs::osx::input_source](https://github.com/pqrs-org/cpp-osx-input_source)
1415

1516
## Install
1617

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

example-app/.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
11
/build_xcode
2-
/vendor/cget/cget.cmake
3-
/vendor/cget/pkg/pqrs-org__cget-recipes/
4-
/vendor/etc/cget/recipes/
5-
/vendor/**/pkgconfig/

example-app/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required (VERSION 3.9)
1+
cmake_minimum_required(VERSION 3.24 FATAL_ERROR)
22

33
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.12" CACHE STRING "Minimum OS X deployment version")
44

@@ -12,7 +12,7 @@ add_compile_options(-O2)
1212
add_compile_options(-fobjc-arc)
1313
add_compile_options(-fmodules)
1414

15-
include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/vendor/include)
15+
include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../vendor/vendor/include)
1616
include_directories(SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../include)
1717

1818
add_executable(

example-app/Makefile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,5 @@ clean:
88
rm -rf build_xcode
99

1010
run:
11-
bash scripts/codesign.sh build_xcode/build/Release
12-
open build_xcode/build/Release/input-source-selector-example-app.app
13-
14-
update_vendor:
15-
rm -rf vendor
16-
cget install pqrs-org/cget-recipes --prefix vendor
17-
cget install -f cget-requirements.txt --prefix vendor
11+
bash scripts/codesign.sh build_xcode/Release
12+
open build_xcode/Release/input-source-selector-example-app.app

example-app/cget-requirements.txt

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

example-app/vendor/cget/cget.cmake

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
set(CGET_PREFIX "/Volumes/repo/github/pqrs-org/cpp-osx-input_source_selector/example-app/vendor")
2+
set(CMAKE_PREFIX_PATH "/Volumes/repo/github/pqrs-org/cpp-osx-input_source_selector/example-app/vendor")
3+
if (${CMAKE_VERSION} VERSION_LESS "3.6.0")
4+
include_directories(SYSTEM ${CGET_PREFIX}/include)
5+
else ()
6+
set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES "${CGET_PREFIX}/include")
7+
set(CMAKE_C_STANDARD_INCLUDE_DIRECTORIES "${CGET_PREFIX}/include")
8+
endif()
9+
if (CMAKE_CROSSCOMPILING)
10+
list(APPEND CMAKE_FIND_ROOT_PATH "/Volumes/repo/github/pqrs-org/cpp-osx-input_source_selector/example-app/vendor")
11+
endif()
12+
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
13+
set(CMAKE_INSTALL_PREFIX "/Volumes/repo/github/pqrs-org/cpp-osx-input_source_selector/example-app/vendor")
14+
endif()
15+
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
16+
set(CMAKE_CXX_ENABLE_PARALLEL_BUILD_FLAG "/MP")
17+
endif()
18+
if (BUILD_SHARED_LIBS)
19+
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS "ON" CACHE BOOL "")
20+
endif()
21+
set(CMAKE_FIND_FRAMEWORK "LAST" CACHE STRING "")
22+
set(CMAKE_INSTALL_RPATH "${CGET_PREFIX}/lib" CACHE STRING "")

example-app/vendor/cget/pkg/pqrs-org__cpp-cf-array/deps/pqrs-org__cpp-osx-input_source

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

example-app/vendor/cget/pkg/pqrs-org__cpp-cf-cf_ptr/deps/pqrs-org__cpp-cf-array

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

example-app/vendor/cget/pkg/pqrs-org__cpp-cf-cf_ptr/deps/pqrs-org__cpp-cf-dictionary

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

example-app/vendor/cget/pkg/pqrs-org__cpp-cf-cf_ptr/deps/pqrs-org__cpp-cf-string

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

example-app/vendor/cget/pkg/pqrs-org__cpp-cf-dictionary/deps/pqrs-org__cpp-osx-input_source

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

example-app/vendor/cget/pkg/pqrs-org__cpp-cf-string/deps/pqrs-org__cpp-osx-input_source

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

example-app/vendor/cget/pkg/pqrs-org__cpp-gcd/deps/pqrs-org__cpp-osx-input_source

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

example-app/vendor/cget/pkg/pqrs-org__cpp-hash/deps/pqrs-org__cpp-osx-input_source

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

example-app/vendor/cget/pkg/pqrs-org__cpp-thread_wait/deps/pqrs-org__cpp-dispatcher

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

example-app/vendor/include/pqrs/cf/array.hpp

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

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

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

example-app/vendor/include/pqrs/cf/dictionary.hpp

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

example-app/vendor/include/pqrs/cf/string.hpp

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

example-app/vendor/include/pqrs/dispatcher.hpp

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

example-app/vendor/include/pqrs/dispatcher/dispatcher.hpp

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

example-app/vendor/include/pqrs/dispatcher/extra/dispatcher_client.hpp

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

example-app/vendor/include/pqrs/dispatcher/extra/shared_dispatcher.hpp

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

example-app/vendor/include/pqrs/dispatcher/extra/timer.hpp

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

example-app/vendor/include/pqrs/dispatcher/object_id.hpp

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

example-app/vendor/include/pqrs/dispatcher/time_source.hpp

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

example-app/vendor/include/pqrs/dispatcher/types.hpp

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

example-app/vendor/include/pqrs/gcd.hpp

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

example-app/vendor/include/pqrs/hash.hpp

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

example-app/vendor/include/pqrs/osx/input_source.hpp

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

example-app/vendor/include/pqrs/osx/input_source/extra/boost.hpp

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

example-app/vendor/include/pqrs/osx/input_source/extra/nlohmann_json.hpp

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

0 commit comments

Comments
 (0)