8000 Granular CMake modules and build targets by ahojnnes · Pull Request #2059 · colmap/colmap · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Granular CMake modules and build targets #2059

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 39 commits into from
Jul 26, 2023
Merged

Granular CMake modules and build targets #2059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
01c29b6
Option manager moves to controllers to disentangle circular deps
ahojnnes Jul 22, 2023
ed9e642
Granular CMake module targets
ahojnnes Jul 22, 2023
208161e
Merge branch 'dev' of https://github.com/colmap/colmap into user/josc…
ahojnnes Jul 22, 2023
a976935
d
ahojnnes Jul 22, 2023
94da826
d
ahojnnes Jul 22, 2023
c5d8e30
d
ahojnnes Jul 22, 2023
8e3feb4
d
ahojnnes Jul 24, 2023
399b6a4
d
ahojnnes Jul 24, 2023
cb23c5d
d
ahojnnes Jul 24, 2023
e825e92
d
ahojnnes Jul 24, 2023
885453f
d
ahojnnes Jul 24, 2023
b0f16b3
d
ahojnnes Jul 24, 2023
6b6729b
d
ahojnnes Jul 24, 2023
f8dceb8
f
ahojnnes Jul 24, 2023
ec005de
f
ahojnnes Jul 24, 2023
8000
3dee713
remove cycles
ahojnnes Jul 24, 2023
5cb71c4
d
ahojnnes Jul 24, 2023
4ad63dd
d
ahojnnes Jul 24, 2023
4588010
Finished removing all cycles
ahojnnes Jul 25, 2023
4e59252
f
ahojnnes Jul 25, 2023
e586032
One more
ahojnnes Jul 25, 2023
29c15a1
f
ahojnnes Jul 25, 2023
a5c3656
openmp
ahojnnes Jul 25, 2023
4b86268
d
ahojnnes Jul 25, 2023
c0b8199
d
ahojnnes Jul 25, 2023
ddd6ea6
f
ahojnnes Jul 25, 2023
8a32e1e
f
ahojnnes Jul 26, 2023
0fb2d96
d
ahojnnes Jul 26, 2023
52bdb99
d
ahojnnes Jul 26, 2023
7394c20
f
ahojnnes Jul 26, 2023
457411e
d
ahojnnes Jul 26, 2023
58c08d7
f
ahojnnes Jul 26, 2023
92da332
d
ahojnnes Jul 26, 2023
28f0d23
d
ahojnnes Jul 26, 2023
ba3fd90
f
ahojnnes Jul 26, 2023
60286cc
d
ahojnnes Jul 26, 2023
d147a44
d
ahojnnes Jul 26, 2023
7955cd1
d
ahojnnes Jul 26, 2023
d630fce
d
ahojnnes Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions .azure-pipelines/build-ubuntu.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@ jobs:

- ${{ if eq(parameters.asanEnabled, true) }}:
- script: |
sudo apt-get install -y clang-15
sudo apt-get install -y clang-15 libomp-15-dev
echo '##vso[task.setvariable variable=CC]/usr/bin/clang-15'
echo '##vso[task.setvariable variable=CXX]/usr/bin/clang++-15'
displayName: Install Clang

- ${{ if eq(parameters.cmakeBuildType, 'ClangTidy') }}:
- script: |
sudo apt-get install -y clang-15 clang-tidy-15
sudo apt-get install -y clang-15 clang-tidy-15 libomp-15-dev
echo '##vso[task.setvariable variable=CC]/usr/bin/clang-15'
echo '##vso[task.setvariable variable=CXX]/usr/bin/clang++-15'
displayName: Install Clang
Expand All @@ -106,17 +106,34 @@ jobs:
condition: ne(variables.CCACHE_RESTORED, 'true')

- script: |
set -x
cmake --version
mkdir build
cd build
cmake .. \
-GNinja \
-DCMAKE_BUILD_TYPE=${{ parameters.cmakeBuildType }} \
-DCMAKE_INSTALL_PREFIX=./install \
-DTESTS_ENABLED=ON \
-DCMAKE_CUDA_ARCHITECTURES=50 \
-DASAN_ENABLED=${{ parameters.asanEnabled }}
ninja -k $(numAllowedNinjaErrors)
displayName: Configure and build
displayName: Configure and build colmap

- ${{ if and(eq(parameters.cmakeBuildType, 'Release'), eq(parameters.asanEnabled, false)) }}:
- script: |
set -x
cd build
ninja install
cd ../doc/sample-project
mkdir build
cd build
colmap_DIR=$(Build.SourcesDirectory)/build/install/share/colmap cmake .. \
-GNinja \
-DCMAKE_CUDA_ARCHITECTURES=50
ninja
./hello_world --message "world"
displayName: Install colmap and build sample

- ${{ if ne(parameters.cmakeBuildType, 'ClangTidy') }}:
- script: |
Expand Down
Loading
0