Skip to content

Commit 500ada2

Browse files
SeaOtocinclusfacebook-github-bot
authored andcommitted
{Build} Fixing CMake library ordering (#260)
Summary: Pull Request resolved: #260 Rollback Plan: Differential Revision: D81725476
1 parent 3eaa794 commit 500ada2

1 file changed

Lines changed: 27 additions & 13 deletions

File tree

cmake/Setup3rdParty.cmake

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,6 @@ FetchContent_Declare(
2020
GIT_TAG f5d0dc5c5c02bf26063ab11ebfaa42f6d1a7c650 # v1.4.0
2121
)
2222

23-
FetchContent_Declare(
24-
vrs
25-
GIT_REPOSITORY https://github.com/facebookresearch/vrs.git
26-
GIT_TAG 26fdab54501d3567f27f953c13b9c786e000b7ee # master Sept 3, 2025.
27-
)
28-
# Override config for vrs
29-
option(UNIT_TESTS OFF)
30-
option(BUILD_SAMPLES OFF)
31-
option(BUILD_TOOLS OFF)
32-
33-
message("Pulling deps: {vrs}")
34-
FetchContent_MakeAvailable(vrs)
35-
3623
FetchContent_Declare(
3724
eigen
3825
GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git
@@ -80,3 +67,30 @@ ExternalProject_Add(
8067
INSTALL_DIR ""
8168
INSTALL_COMMAND ""
8269
)
70+
71+
# Enable long paths on Windows -- required for checking out Ocean in vrs
72+
if(WIN32)
73+
execute_process(
74+
COMMAND git config --system core.longpaths true
75+
RESULT_VARIABLE result
76+
OUTPUT_VARIABLE output
77+
ERROR_VARIABLE error
78+
)
79+
if(NOT result EQUAL 0)
80+
message(WARNING "Failed to set git core.longpaths: ${error}")
81+
endif()
82+
endif()
83+
84+
FetchContent_Declare(
85+
vrs
86+
GIT_REPOSITORY https://github.com/facebookresearch/vrs.git
87+
GIT_TAG 26fdab54501d3567f27f953c13b9c786e000b7ee # master Sept 3, 2025.
88+
)
89+
# Override config for vrs
90+
option(UNIT_TESTS OFF)
91+
option(BUILD_SAMPLES OFF)
92+
option(BUILD_TOOLS OFF)
93+
option(BUILD_WITH_XPRS OFF)
94+
95+
message("Pulling deps: {vrs}")
96+
FetchContent_MakeAvailable(vrs)

0 commit comments

Comments
 (0)