Skip to content

Commit

Permalink
Merge branch 'dev' into ui-redesign
Browse files Browse the repository at this point in the history
  • Loading branch information
brenocq committed Jan 16, 2025
2 parents c8de137 + 34f5d3f commit c79aa8a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
5 changes: 2 additions & 3 deletions src/extern/solveCurlpp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@ if(ATTA_SYSTEM_NAME MATCHES "Linux")
FetchContent_Declare(
curlpp
GIT_REPOSITORY "https://github.com/jpbarrette/curlpp"
GIT_TAG "v0.8.1"
GIT_TAG "d080e301ec71061c46049d23fedfb8106be3153f"
GIT_PROGRESS TRUE
GIT_SHALLOW TRUE
)
atta_log(Info Extern "Fetching curlpp...")
atta_FetchContent_MakeAvailable(curlpp)
atta_FetchContent_MakeAvailable(curlpp)

# Fix INTERFACE_INCLUDE_DIRECTORIES to not include local build
set_property(TARGET curlpp_static PROPERTY INTERFACE_INCLUDE_DIRECTORIES "")
Expand Down
1 change: 0 additions & 1 deletion src/extern/solveImguizmo.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ FetchContent_Declare(
GIT_REPOSITORY "https://github.com/CedricGuillemet/ImGuizmo.git"
GIT_TAG "ba662b1"
GIT_PROGRESS TRUE
GIT_SHALLOW TRUE
)
atta_log(Info Extern "Fetching ImGuizmo...")
FetchContent_MakeAvailable(imguizmo)
Expand Down
2 changes: 1 addition & 1 deletion src/extern/solveImplot.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set(IMPLOT_SOURCE
add_library(implot STATIC
${IMPLOT_SOURCE}
)
target_include_directories(implot PUBLIC
target_include_directories(implot PUBLIC
$<BUILD_INTERFACE:${FETCHCONTENT_BASE_DIR}/implot-src>
$<INSTALL_INTERFACE:include/${ATTA_VERSION_SAFE}/extern/implot>
)
Expand Down

0 comments on commit c79aa8a

Please sign in to comment.