Skip to content

Enable build and install on macos #153

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

Draft
themightyoarfish wants to merge 10 commits into
base: master
Choose a base branch
from
Draft

Enable build and install on macos #153

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1981309
fix assimp linking and glm+assimp dependencies for installed project
themightyoarfish Nov 29, 2024
4c9401f
Add missing include
themightyoarfish Nov 29, 2024
10080aa
Fix glm FOUND variable
themightyoarfish Nov 29, 2024
bc26ae1
Add missing install of gl3w files
themightyoarfish Dec 1, 2024
6c9ee22
add missing glfw3 dependency
themightyoarfish Dec 1, 2024
4bece2d
Reduce opengl version to make it work on macos sequoia
themightyoarfish Dec 6, 2024
f43734e
Merge branch 'master-origin'
themightyoarfish Jul 27, 2025
4a4aa53
pick_depth(): return closest depth inside window
themightyoarfish Jul 28, 2025
c6a6016
scale frame buffer size with window scale
themightyoarfish Jul 28, 2025
134f4e1
Use display scaling factor on macos
themightyoarfish Jul 28, 2025
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
7 changes: 4 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
endif()

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/cmake")
# list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
Copy link
Contributor Author

@themightyoarfish themightyoarfish Dec 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the problem here is that the vendored cmake module for glm didnt work for me (see issues)

set(OpenGL_GL_PREFERENCE GLVND)

if(BUILD_WITH_MARCH_NATIVE)
Expand All @@ -26,7 +26,7 @@ endif()

find_package(OpenGL REQUIRED)

find_package(glm)
find_package(glm 1.0.1 CONFIG REQUIRED)
find_package(glfw3)
find_package(Eigen3)
find_package(PNG)
Expand Down Expand Up @@ -95,7 +95,7 @@ else()
endif()

if(${assimp_FOUND})
list(APPEND EXTRA_LIBRARIES assimp)
list(APPEND EXTRA_LIBRARIES ${ASSIMP_LIBRARIES})
list(APPEND EXTRA_SOURCE src/glk/io/mesh_io.cpp)
endif()

Expand Down Expand Up @@ -296,6 +296,7 @@ endif()

install(DIRECTORY include/ DESTINATION ${INCLUDE_INSTALL_DIR})
install(DIRECTORY thirdparty/gl3w/GL/ DESTINATION ${INCLUDE_INSTALL_DIR}/GL)
install(DIRECTORY thirdparty/gl3w/KHR/ DESTINATION ${INCLUDE_INSTALL_DIR}/KHR)
install(FILES thirdparty/imgui/imgui.h thirdparty/imgui/imconfig.h thirdparty/imgui/imgui_internal.h thirdparty/imgui/imstb_textedit.h DESTINATION ${INCLUDE_INSTALL_DIR})
install(FILES thirdparty/implot/implot.h thirdparty/implot/implot_internal.h DESTINATION ${INCLUDE_INSTALL_DIR})
install(FILES thirdparty/portable-file-dialogs/portable-file-dialogs.h DESTINATION ${INCLUDE_INSTALL_DIR})
Expand Down
3 changes: 3 additions & 0 deletions cmake/iridescence-config.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ find_dependency(OpenGL REQUIRED)
find_dependency(Eigen3 REQUIRED)
find_dependency(PNG)
find_dependency(JPEG)
find_dependency(glm)
find_dependency(assimp)
find_dependency(glfw3)

include("${CMAKE_CURRENT_LIST_DIR}/iridescence-targets.cmake")
add_library(Iridescence::Iridescence ALIAS Iridescence::iridescence)
1 change: 1 addition & 0 deletions src/glk/pointcloud_buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include <glk/pointcloud_buffer.hpp>

#include <random>
#include <cassert>
#include <numeric>
#include <iostream>
#include <glk/colormap.hpp>
Expand Down