Skip to content

Commit 0590d45

Browse files
danrbaileydanrbailey
authored
Merge pull request #1319 from danrbailey/openvdb_cmd
Relocate vdb binaries to openvdb_cmd root directory
2 parents 7a1c176 + d1658b3 commit 0590d45

31 files changed

+277
-244
lines changed

‎.github/workflows/ax.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ jobs:
5656
matrix:
5757
config:
5858
# Unified
59-
- { image: '2021-clang10', cxx: 'clang++', build: 'Release', j: '2', components: 'core,axcore,axbin,axtest' }
60-
- { image: '2021-clang10', cxx: 'g++', build: 'Release', j: '1', components: 'core,axcore,axbin,axtest' }
61-
- { image: '2022-clang11', cxx: 'clang++', build: 'Debug', j: '2', components: 'core,axcore,axbin,axtest' }
62-
- { image: '2022-clang11', cxx: 'clang++', build: 'Release', j: '2', components: 'core,axcore,axbin,axtest' }
63-
- { image: '2022-clang11', cxx: 'g++', build: 'Release', j: '1', components: 'core,axcore,axbin,axtest' }
59+
- { image: '2021-clang10', cxx: 'clang++', build: 'Release', j: '2', components: 'core,bin,axcore,axbin,axtest' }
60+
- { image: '2021-clang10', cxx: 'g++', build: 'Release', j: '1', components: 'core,bin,axcore,axbin,axtest' }
61+
- { image: '2022-clang11', cxx: 'clang++', build: 'Debug', j: '2', components: 'core,bin,axcore,axbin,axtest' }
62+
- { image: '2022-clang11', cxx: 'clang++', build: 'Release', j: '2', components: 'core,bin,axcore,axbin,axtest' }
63+
- { image: '2022-clang11', cxx: 'g++', build: 'Release', j: '1', components: 'core,bin,axcore,axbin,axtest' }
6464
fail-fast: false
6565
steps:
6666
- uses: actions/checkout@v2
@@ -97,7 +97,7 @@ jobs:
9797
./ci/build.sh -v
9898
-j ${{ matrix.config.j }}
9999
--build-type=${{ matrix.config.build }}
100-
--components="axcore,axbin,axtest"
100+
--components="bin,axcore,axbin,axtest"
101101
--cargs=\"
102102
-DOPENVDB_AX_TEST_CMD_DOWNLOADS=ON
103103
-DUSE_EXPLICIT_INSTANTIATION=OFF
@@ -140,7 +140,7 @@ jobs:
140140
run: >
141141
./ci/build.sh -v
142142
--build-type=${{ matrix.config.build }}
143-
--components="core,axcore,axbin,axtest"
143+
--components="core,bin,axcore,axbin,axtest"
144144
--cargs=\"
145145
-DOPENVDB_AX_TEST_CMD_DOWNLOADS=ON
146146
-DUSE_EXPLICIT_INSTANTIATION=OFF

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
run: >
9393
./ci/build.sh -v
9494
--build-type=${{ matrix.config.build }}
95-
--components=\"core,python,bin,test\"
95+
--components=\"core,python,bin,view,render,test\"
9696
--cargs=\"-DOPENVDB_CXX_STRICT=ON -DOPENVDB_ABI_VERSION_NUMBER=${{ matrix.config.abi }}\"
9797
- name: test
9898
# Always run tests on weekly builds but skip Debug on commits as they take a while.
@@ -146,7 +146,7 @@ jobs:
146146
run: >
147147
./ci/build.sh -v
148148
--config=${{ matrix.config.build }}
149-
--components=\"core,bin,test\"
149+
--components=\"core,bin,view,render,test\"
150150
--cargs=\'${{ matrix.config.cmake }} -DUSE_EXR=ON -DUSE_PNG=ON -DVCPKG_TARGET_TRIPLET=${VCPKG_DEFAULT_TRIPLET} -DCMAKE_TOOLCHAIN_FILE=\"${VCPKG_INSTALLATION_ROOT}\\scripts\\buildsystems\\vcpkg.cmake\"\'
151151
- name: test
152152
shell: bash
@@ -182,7 +182,7 @@ jobs:
182182
run: >
183183
./ci/build.sh -v
184184
--build-type=Release
185-
--components=\"core,python,bin,test\"
185+
--components=\"core,python,bin,view,render,test\"
186186
--cargs=\"-DOPENVDB_CXX_STRICT=OFF -DOPENVDB_ABI_VERSION_NUMBER=9 -DOPENVDB_SIMD=SSE42\"
187187
- name: test
188188
shell: bash

‎.github/workflows/houdini.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ jobs:
6464
strategy:
6565
matrix:
6666
config:
67-
- { cxx: clang++, image: '2020', hou: '19_0', j: '2', build: 'Release', components: 'core,hou,bin,python,test,axcore,axbin,axtest', disable_checks: 'OFF' }
68-
- { cxx: clang++, image: '2020', hou: '18_5', j: '2', build: 'Release', components: 'core,hou,bin,python,test,axcore,axbin,axtest', disable_checks: 'OFF' }
67+
- { cxx: clang++, image: '2020', hou: '19_0', j: '2', build: 'Release', components: 'core,hou,bin,view,render,python,test,axcore,axbin,axtest', disable_checks: 'OFF' }
68+
- { cxx: clang++, image: '2020', hou: '18_5', j: '2', build: 'Release', components: 'core,hou,bin,view,render,python,test,axcore,axbin,axtest', disable_checks: 'OFF' }
6969
- { cxx: clang++, image: '2020', hou: '19_0', j: '2', build: 'Debug', components: 'core,hou', disable_checks: 'OFF' }
7070
- { cxx: g++, image: '2020', hou: '19_0', j: '1', build: 'Release', components: 'core,hou', disable_checks: 'OFF' }
7171
fail-fast: false

‎.github/workflows/weekly.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
cd $HOME/houdini_install/hou && source houdini_setup_bash && cd - &&
7676
./ci/build.sh -v
7777
--build-type=Release
78-
--components="core,hou,bin,python,test,axcore,axbin,axtest"
78+
--components="core,hou,bin,view,render,python,test,axcore,axbin,axtest"
7979
--cargs=\"-DDISABLE_CMAKE_SEARCH_PATHS=ON -DOPENVDB_BUILD_HOUDINI_ABITESTS=ON -DOPENVDB_HOUDINI_INSTALL_PREFIX=/tmp\"
8080
- name: test
8181
run: cd build && ctest -V
@@ -122,7 +122,7 @@ jobs:
122122
cd $HOME/houdini_install/hou && source houdini_setup_bash && cd - &&
123123
./ci/build.sh -v
124124
--build-type=Release
125-
--components="core,hou,bin,python,test,axcore,axbin,axtest"
125+
--components="core,hou,bin,view,render,python,test,axcore,axbin,axtest"
126126
--cargs=\"-DDISABLE_CMAKE_SEARCH_PATHS=ON -DOPENVDB_BUILD_HOUDINI_ABITESTS=ON -DOPENVDB_HOUDINI_INSTALL_PREFIX=/tmp\"
127127
- name: test
128128
run: cd build && ctest -V
@@ -210,7 +210,7 @@ jobs:
210210
run: >
211211
./ci/build.sh -v
212212
--build-type=Release
213-
--components=\"core,python,bin,test\"
213+
--components=\"core,python,bin,view,render,test\"
214214
--cargs=\"-DOPENVDB_CXX_STRICT=ON -DOPENVDB_ABI_VERSION_NUMBER=9 ${{ matrix.config.cmake }}\"
215215
- name: test
216216
run: cd build && ctest -V
@@ -245,7 +245,7 @@ jobs:
245245
./ci/build.sh -v
246246
--build-type=Release
247247
-j ${{ matrix.config.j }}
248-
--components=\"core,python,test,bin,axcore,axbin,axtest\"
248+
--components=\"core,python,test,bin,view,render,axcore,axbin,axtest\"
249249
--cargs=\"
250250
-DUSE_BLOSC=OFF
251251
-DCMAKE_CXX_STANDARD=17
@@ -277,7 +277,7 @@ jobs:
277277
run: >
278278
./ci/build.sh -v
279279
--build-type=Release
280-
--components=\"core,bin,test\"
280+
--components=\"core,bin,view,render,test\"
281281
--cargs=\"-DOPENVDB_CXX_STRICT=OFF -DUSE_BLOSC=OFF -DUSE_ZLIB=OFF\"
282282
- name: test
283283
shell: bash
@@ -310,7 +310,7 @@ jobs:
310310
run: >
311311
./ci/build.sh -v
312312
--build-type=Release
313-
--components=\"core,python,bin,test\"
313+
--components=\"core,python,bin,view,render,test\"
314314
--cargs=\"-DOPENVDB_CXX_STRICT=OFF -DOPENVDB_ABI_VERSION_NUMBER=9 -DOPENVDB_SIMD=SSE42\"
315315
- name: test
316316
shell: bash
@@ -336,8 +336,8 @@ jobs:
336336
matrix:
337337
config:
338338
# Unified
339-
- { image: '2020-clang7', cxx: 'clang++', build: 'Release', j: '2', components: 'core,axcore,axbin,axtest' }
340-
- { image: '2020-clang7', cxx: 'g++', build: 'Release', j: '1', components: 'core,axcore,axbin,axtest' }
339+
- { image: '2020-clang7', cxx: 'clang++', build: 'Release', j: '2', components: 'core,bin,axcore,axbin,axtest' }
340+
- { image: '2020-clang7', cxx: 'g++', build: 'Release', j: '1', components: 'core,bin,axcore,axbin,axtest' }
341341
# Standalone
342342
- { image: '2021-clang10', cxx: 'clang++', build: 'Release', j: '2', components: 'core' }
343343
- { image: '2022-clang11', cxx: 'clang++', build: 'Debug', j: '2', components: 'core' }
@@ -366,7 +366,7 @@ jobs:
366366
./ci/build.sh -v
367367
-j ${{ matrix.config.j }}
368368
--build-type=${{ matrix.config.build }}
369-
--components="axcore,axbin,axtest"
369+
--components="bin,axcore,axbin,axtest"
370370
--cargs=\"
371371
-DOPENVDB_AX_TEST_CMD_DOWNLOADS=ON
372372
-DUSE_EXPLICIT_INSTANTIATION=OFF
@@ -401,7 +401,7 @@ jobs:
401401
run: >
402402
./ci/build.sh -v
403403
--build-type=${{ matrix.config.build }}
404-
--components="core,axcore,axbin,axtest"
404+
--components="core,bin,axcore,axbin,axtest"
405405
--cargs=\"
406406
-DOPENVDB_AX_TEST_CMD_DOWNLOADS=ON
407407
-DUSE_EXPLICIT_INSTANTIATION=OFF
@@ -452,7 +452,7 @@ jobs:
452452
run: >
453453
./ci/build.sh -v
454454
--config=${{ matrix.config.build }}
455-
--components=\"core,axcore,axbin,axtest\"
455+
--components=\"core,bin,axcore,axbin,axtest\"
456456
--cargs=\'
457457
-A x64 -G \"Visual Studio 16 2019\"
458458
-DVCPKG_TARGET_TRIPLET=${VCPKG_DEFAULT_TRIPLET}

‎CMakeLists.txt‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ option(OPENVDB_BUILD_HOUDINI_PLUGIN "Build the Houdini plugin" OFF)
7474
option(OPENVDB_BUILD_HOUDINI_ABITESTS "Build the Houdini ABI tests" OFF)
7575

7676
option(OPENVDB_BUILD_AX "Build the OpenVDB AX library. Turns ON if USE_AX is ON." ${USE_AX})
77-
option(OPENVDB_BUILD_AX_BINARIES "Build the OpenVDB AX command line binary" OFF)
7877
option(OPENVDB_BUILD_AX_UNITTESTS "Build the OpenVDB AX unit tests" OFF)
7978

8079
option(OPENVDB_BUILD_NANOVDB "Build the NanoVDB library. Turns ON if USE_NANOVDB is ON." ${USE_NANOVDB})
@@ -432,7 +431,6 @@ if(NOT (
432431
OPENVDB_BUILD_CORE OR
433432
OPENVDB_BUILD_BINARIES OR
434433
OPENVDB_BUILD_AX OR
435-
OPENVDB_BUILD_AX_BINARIES OR
436434
OPENVDB_BUILD_AX_UNITTESTS OR
437435
OPENVDB_BUILD_PYTHON_MODULE OR
438436
OPENVDB_BUILD_UNITTESTS OR
@@ -572,8 +570,7 @@ message(STATUS "Configuring for OpenVDB Version ${OpenVDB_VERSION}")
572570
# Locate openvdb_ax if necessary
573571

574572
if(NOT OPENVDB_BUILD_AX AND
575-
(OPENVDB_BUILD_AX_BINARIES OR
576-
OPENVDB_BUILD_AX_UNITTESTS OR
573+
(OPENVDB_BUILD_AX_UNITTESTS OR
577574
USE_AX))
578575
find_package(OpenVDB REQUIRED COMPONENTS openvdb_ax)
579576
endif()
@@ -659,10 +656,6 @@ if(OPENVDB_BUILD_AX)
659656
add_subdirectory(openvdb_ax/openvdb_ax)
660657
endif()
661658

662-
if(OPENVDB_BUILD_AX_BINARIES)
663-
add_subdirectory(openvdb_ax/openvdb_ax/cmd)
664-
endif()
665-
666659
if(OPENVDB_BUILD_AX_UNITTESTS)
667660
add_subdirectory(openvdb_ax/openvdb_ax/test)
668661
endif()
@@ -672,7 +665,7 @@ if(OPENVDB_BUILD_PYTHON_MODULE)
672665
endif()
673666

674667
if(OPENVDB_BUILD_BINARIES)
675-
add_subdirectory(openvdb/openvdb/cmd)
668+
add_subdirectory(openvdb_cmd)
676669
endif()
677670

678671
if(OPENVDB_BUILD_UNITTESTS)

‎ci/build.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ COMPONENTS['core']='OPENVDB_BUILD_CORE'
3535
COMPONENTS['python']='OPENVDB_BUILD_PYTHON_MODULE'
3636
COMPONENTS['test']='OPENVDB_BUILD_UNITTESTS'
3737
COMPONENTS['bin']='OPENVDB_BUILD_BINARIES'
38+
COMPONENTS['view']='OPENVDB_BUILD_VDB_VIEW'
39+
COMPONENTS['render']='OPENVDB_BUILD_VDB_RENDER'
3840
COMPONENTS['hou']='OPENVDB_BUILD_HOUDINI_PLUGIN'
3941
COMPONENTS['doc']='OPENVDB_BUILD_DOCS'
4042

@@ -153,14 +155,12 @@ cd build
153155
set -x
154156

155157
# Note:
156-
# - all sub binary options are always on and can be toggles with: OPENVDB_BUILD_BINARIES=ON/OFF
158+
# - print and lod binary options are always on and can be toggles with: OPENVDB_BUILD_BINARIES=ON/OFF
157159
cmake \
158160
-DOPENVDB_USE_DEPRECATED_ABI_6=ON \
159161
-DOPENVDB_USE_DEPRECATED_ABI_7=ON \
160162
-DOPENVDB_BUILD_VDB_PRINT=ON \
161163
-DOPENVDB_BUILD_VDB_LOD=ON \
162-
-DOPENVDB_BUILD_VDB_RENDER=ON \
163-
-DOPENVDB_BUILD_VDB_VIEW=ON \
164164
-DMSVC_MP_THREAD_COUNT=${PARMS[-j]} \
165165
"${CMAKE_EXTRA[@]}" \
166166
..

‎ci/extract_test_examples.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
set -e
1414

1515
ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/../"
16-
VDB_AX=$ROOT/build/openvdb_ax/openvdb_ax/cmd/vdb_ax
16+
VDB_AX=$ROOT/build/openvdb_cmd/vdb_ax/vdb_ax
1717

1818
DOCS=()
1919
DOCS+=($ROOT/doc/ax/ax.txt)

‎ci/test_install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ cmakelists="
1111
cmake_minimum_required(VERSION 3.15)
1212
project(TestInstall LANGUAGES CXX)
1313
find_package(OpenVDB REQUIRED COMPONENTS openvdb)
14-
add_executable(test_vdb_print \"../openvdb/openvdb/cmd/openvdb_print.cc\")
14+
add_executable(test_vdb_print \"../openvdb_cmd/vdb_print/main.cc\")
1515
target_link_libraries(test_vdb_print OpenVDB::openvdb)
1616
"
1717
mkdir tmp

0 commit comments

Comments
 (0)