Skip to content

Commit cd8c6da

Browse files
sean-parentsean-parent
authored
Factored out enum_ops (#146)
* Factored out enum_ops library into stlab/enum-ops. * Fixing clang-tidy issue. * Removed unnecessary CI installs.
1 parent 08845b7 commit cd8c6da

6 files changed

Lines changed: 89 additions & 321 deletions

File tree

‎.github/workflows/adobe_source_libraries.yml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -34,33 +34,33 @@ jobs:
3434
steps:
3535
- uses: actions/checkout@v4
3636

37-
- name: Install dependencies (macos)
38-
if: ${{ startsWith(matrix.config.os, 'macos') }}
39-
run: |
40-
rm '/usr/local/bin/2to3'
41-
rm '/usr/local/bin/2to3-3.12'
42-
rm '/usr/local/bin/idle3'
43-
rm '/usr/local/bin/idle3.12'
44-
rm '/usr/local/bin/pydoc3'
45-
rm '/usr/local/bin/pydoc3.12'
46-
rm '/usr/local/bin/python3'
47-
rm '/usr/local/bin/python3.12'
48-
rm '/usr/local/bin/python3-config'
49-
rm '/usr/local/bin/python3.12-config'
50-
brew install ninja
51-
shell: bash
37+
# - name: Install dependencies (macos)
38+
# if: ${{ startsWith(matrix.config.os, 'macos') }}
39+
# run: |
40+
# rm '/usr/local/bin/2to3'
41+
# rm '/usr/local/bin/2to3-3.12'
42+
# rm '/usr/local/bin/idle3'
43+
# rm '/usr/local/bin/idle3.12'
44+
# rm '/usr/local/bin/pydoc3'
45+
# rm '/usr/local/bin/pydoc3.12'
46+
# rm '/usr/local/bin/python3'
47+
# rm '/usr/local/bin/python3.12'
48+
# rm '/usr/local/bin/python3-config'
49+
# rm '/usr/local/bin/python3.12-config'
50+
# brew install ninja
51+
# shell: bash
5252

53-
- name: Install dependencies (ubuntu)
54-
if: ${{ startsWith(matrix.config.os, 'ubuntu') }}
55-
run: |
56-
sudo apt-get install -y ninja-build
57-
shell: bash
53+
# - name: Install dependencies (ubuntu)
54+
# if: ${{ startsWith(matrix.config.os, 'ubuntu') }}
55+
# run: |
56+
# sudo apt-get install -y ninja-build
57+
# shell: bash
5858

59-
- name: Install dependencies (Windows)
60-
if: ${{ startsWith(matrix.config.os, 'windows') }}
61-
run: |
62-
choco install --yes ninja
63-
shell: cmd
59+
# - name: Install dependencies (Windows)
60+
# if: ${{ startsWith(matrix.config.os, 'windows') }}
61+
# run: |
62+
# choco install --yes ninja
63+
# shell: cmd
6464

6565
- name: Set enviroment variables (Linux+GCC)
6666
if: ${{ matrix.config.compiler == 'gcc' }}

‎CMakeLists.txt‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
cmake_minimum_required(VERSION 3.29)
2+
project(adobe-source-libraries CXX)
23
include(FindGit)
34
include(CMakeParseArguments)
45

@@ -10,19 +11,24 @@ if(WIN32)
1011
set(CMAKE_OBJECT_PATH_MAX 500)
1112
endif()
1213

13-
project(adobe_source_libraries CXX)
14-
1514
################################################################################
1615

1716
# Enable CPM caching to avoid re-downloading dependencies. Must be before CPM.cmake include.
18-
set(CPM_SOURCE_CACHE ${CMAKE_SOURCE_DIR}/.cpm-cache CACHE PATH "Directory to cache CPM packages" FORCE)
17+
set(CPM_SOURCE_CACHE ${CMAKE_SOURCE_DIR}/.cache/cpm CACHE PATH "Directory to cache CPM packages" FORCE)
1918

2019
include(cmake/CPM.cmake)
2120

2221
################################################################################
2322
# Dependencies
2423

25-
CPMAddPackage("gh:stlab/copy-on-write@1.0.3")
24+
# https://github.com/stlab/copy-on-write/releases
25+
CPMAddPackage("gh:stlab/copy-on-write@1.0.4")
26+
27+
# https://github.com/stlab/enum-ops/releases
28+
CPMAddPackage(gh:stlab/enum-ops@1.0.4)
29+
# CPMAddPackage(NAME enum-ops
30+
# URL "${CMAKE_SOURCE_DIR}/../enum-ops"
31+
# )
2632

2733
################################################################################
2834

@@ -43,8 +49,6 @@ if(CMAKE_EXPORT_COMPILE_COMMANDS AND PROJECT_IS_TOP_LEVEL)
4349
)
4450
endif()
4551

46-
project(adobe-source-libraries CXX)
47-
4852
# https://github.com/boostorg/boost/releases
4953
CPMAddPackage(
5054
NAME Boost
@@ -64,6 +68,7 @@ function(target_link_boost target)
6468
target_link_libraries(${target} PUBLIC Boost::multiprecision)
6569
target_link_libraries(${target} PUBLIC Boost::date_time)
6670
target_link_libraries(${target} PUBLIC stlab::copy-on-write)
71+
target_link_libraries(${target} PUBLIC stlab::enum-ops)
6772
endfunction(target_link_boost)
6873

6974
function(target_link_boost_test target)

‎CMakePresets.json‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
"cacheVariables": {
1111
"CMAKE_BUILD_TYPE": "DEBUG",
1212
"CMAKE_CXX_STANDARD": "20",
13-
"CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}",
14-
"CPM_SOURCE_CACHE": "${sourceParentDir}/.cache/CPM"
13+
"CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
1514
},
1615
"architecture": {
1716
"value": "x64",
@@ -34,8 +33,7 @@
3433
"cacheVariables": {
3534
"CMAKE_BUILD_TYPE": "DEBUG",
3635
"CMAKE_CXX_STANDARD": "17",
37-
"CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}",
38-
"CPM_SOURCE_CACHE": "${sourceParentDir}/.cache/CPM"
36+
"CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
3937
},
4038
"architecture": {
4139
"value": "x64",
@@ -58,8 +56,7 @@
5856
"cacheVariables": {
5957
"CMAKE_BUILD_TYPE": "DEBUG",
6058
"CMAKE_CXX_STANDARD": "20",
61-
"CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}",
62-
"CPM_SOURCE_CACHE": "${sourceParentDir}/.cache/CPM"
59+
"CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
6360
},
6461
"vendor": {
6562
"microsoft.com/VisualStudioSettings/CMake/1.0": {
@@ -77,8 +74,7 @@
7774
"binaryDir": "${sourceParentDir}/build/asl-${presetName}",
7875
"cacheVariables": {
7976
"CMAKE_BUILD_TYPE": "DEBUG",
80-
"CMAKE_CXX_STANDARD": "17",
81-
"CPM_SOURCE_CACHE": "${sourceParentDir}/.cache/CPM"
77+
"CMAKE_CXX_STANDARD": "17"
8278
}
8379
},
8480
{
@@ -89,8 +85,7 @@
8985
"cacheVariables": {
9086
"CMAKE_CXX_STANDARD": "17",
9187
"CMAKE_BUILD_TYPE": "DEBUG",
92-
"CMAKE_CXX_CLANG_TIDY": "clang-tidy",
93-
"CPM_SOURCE_CACHE": "${sourceParentDir}/.cache/CPM"
88+
"CMAKE_CXX_CLANG_TIDY": "clang-tidy"
9489
}
9590
},
9691
{
@@ -174,7 +169,7 @@
174169
"displayName": "Build Documentation",
175170
"description": "Build the documentation",
176171
"configurePreset": "docs",
177-
"targets": ["docs"]
172+
"targets": "docs"
178173
}
179174
],
180175
"testPresets": [

0 commit comments

Comments
 (0)