Skip to content

Commit

Permalink
Add pthread-win32
Browse files Browse the repository at this point in the history
  • Loading branch information
serivesmejia committed Oct 8, 2024
1 parent 74a3535 commit ce1758f
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/build_natives.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,10 @@ jobs:
with:
distribution: adopt
java-version: "8"
- uses: cygwin/cygwin-install-action@master
- name: Configure CMake
run: |
bash cd ${{github.workspace}} && cmake -T ClangCL .
run: cmake -T ClangCL .
- name: Build
run: bash cmake --build ${{github.workspace}} --config ${{env.BUILD_TYPE}}
run: cmake --build ${{github.workspace}} --config ${{env.BUILD_TYPE}}
- uses: actions/upload-artifact@v3
with:
name: native-windows-amd64
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "src/main/cpp/apriltag"]
path = apriltag
url = https://github.com/AprilRobotics/apriltag/
[submodule "pthread-win32"]
path = pthread-win32
url = https://github.com/GerHobbelt/pthread-win32
6 changes: 6 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ set(JAVA_AWT_INCLUDE_PATH NotNeeded)

find_package(JNI REQUIRED)

if (WIN32)
add_subdirectory(pthread-win32/)
target_link_libraries(apriltag pthread)
target_include_directories(apriltag PRIVATE pthread-win32/)
endif()

add_library( # Specifies the name of the library.
apriltag

Expand Down
1 change: 1 addition & 0 deletions pthread-win32
Submodule pthread-win32 added at 3309f4

0 comments on commit ce1758f

Please sign in to comment.