Skip to content

Commit b46f45c

Browse files
author
Isaac Brodsky
committed
Try to fix OSX tests
1 parent ff92851 commit b46f45c

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

.github/workflows/test-osx.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,10 @@ jobs:
3333
make test
3434
sudo make install
3535
36-
# TODO: Doesn't build because of h3/h3api.h not found
37-
# - name: Examples
38-
# run: |
39-
# mkdir build/examples
40-
# cd build/examples
41-
# cmake ../../examples
42-
# make
43-
# make test
36+
- name: Examples
37+
run: |
38+
mkdir build/examples
39+
cd build/examples
40+
cmake ../../examples
41+
make
42+
make test

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ The public API of this library consists of the functions declared in file
88
## [Unreleased]
99
### Fixed
1010
- Fixed building the library with custom memory allocation functions on Mac OSX. (#362)
11+
- The installed H3 CMake target should have include directories specified. (#381)
1112
### Changed
1213
- Tests now use `bash` on Windows. (#381)
1314

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,10 +660,11 @@ install(
660660
install(
661661
TARGETS h3
662662
EXPORT "${TARGETS_EXPORT_NAME}"
663+
COMPONENT libh3
663664
LIBRARY DESTINATION "lib"
664665
ARCHIVE DESTINATION "lib"
665666
RUNTIME DESTINATION "bin"
666-
COMPONENT libh3
667+
INCLUDES DESTINATION "${include_install_dir}"
667668
)
668669

669670
# Headers:

0 commit comments

Comments
 (0)