Skip to content

Commit eb3522d

Browse files
qnzhouQingnan Zhou
andauthored
Sync with 9683764 (#74)
Co-authored-by: Qingnan Zhou <qzhou@Qingnans-MacBook-Pro.local>
1 parent 1dd323e commit eb3522d

525 files changed

Lines changed: 6179 additions & 2883 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ option(LAGRANGE_FMT_EIGEN_FIX "Avoid MSVC C1001 error releated to fmt
192192
option(LAGRANGE_INSTALL "Enable installation" ${LAGRANGE_TOPLEVEL_PROJECT})
193193
option(LAGRANGE_LIMIT_PARALLELISM "Limit parallelism according to available cpu/memory" OFF)
194194
option(LAGRANGE_MORE_WARNINGS "Increase the level of warnings when compiling" OFF)
195+
option(LAGRANGE_PROPAGATE_WARNINGS "Propagate warning flags to dependent targets" ON)
195196
option(LAGRANGE_PERFORMANCE_TESTS "Build all performance tests" OFF)
196197
option(LAGRANGE_UNIT_TESTS "Build all unit tests" ${LAGRANGE_TOPLEVEL_PROJECT})
197198
option(LAGRANGE_USE_PCH "Enable precompiled headers" OFF)

NOTICE.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,4 +264,3 @@ This codebase contains a modified portion of code from valuable which can be obt
264264

265265
* LICENSE:
266266
* https://github.com/LoopPerfect/valuable/blob/master/LICENSE
267-

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.37.0
1+
6.38.0
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
anorigami;baking;cad_io;contouring;decal;deformers;filtering;meshproc;quadrangulation
1+
anorigami;baking;cad_io;contouring;decal;deformers;filtering;meshproc;quadrangulation;solver;texproc

cmake/lagrange/lagrange_add_module.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ function(lagrange_add_module)
4141

4242
target_compile_features(lagrange_${module_name} ${module_scope} cxx_std_17)
4343

44+
lagrange_add_warnings(lagrange_${module_name})
45+
4446
# Target sources
4547
file(GLOB_RECURSE INC_FILES "include/*.h")
4648
file(GLOB_RECURSE SRC_FILES "src/*.cpp" "src/*.h")

cmake/lagrange/lagrange_add_test.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ function(lagrange_add_test)
5656
# Register tests
5757
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/reports")
5858

59-
if(LAGRANGE_TOPLEVEL_PROJECT AND NOT EMSCRIPTEN AND NOT USE_SANITIZER MATCHES "([Tt]hread)")
59+
if(LAGRANGE_TOPLEVEL_PROJECT AND NOT USE_SANITIZER MATCHES "([Tt]hread)")
6060
catch_discover_tests(${test_target}
6161
REPORTER junit
6262
OUTPUT_DIR "${CMAKE_BINARY_DIR}/reports"

cmake/lagrange/lagrange_download_data.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function(lagrange_download_data)
2929
PREFIX "${FETCHCONTENT_BASE_DIR}/lagrange-test-data"
3030
SOURCE_DIR ${LAGRANGE_DATA_FOLDER}
3131
GIT_REPOSITORY https://github.com/adobe/lagrange-test-data.git
32-
GIT_TAG 093892ef8ffea98350a181af48e119c7dd3e692e
32+
GIT_TAG 84682ceaec9ab472a204d10446cc4b1da9cbcacb
3333
CONFIGURE_COMMAND ""
3434
BUILD_COMMAND ""
3535
INSTALL_COMMAND ""

cmake/lagrange/lagrange_find_package.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ function(lagrange_find_package name)
6060
if(${name} STREQUAL embree AND NOT TARGET embree::embree)
6161
add_library(embree::embree ALIAS embree) # TODO: Fix port instead?
6262
endif()
63+
if(${name} STREQUAL OpenSubdiv)
64+
target_compile_definitions(OpenSubdiv::osdCPU_static INTERFACE _USE_MATH_DEFINES)
65+
endif()
6366
else()
6467
if(${name} STREQUAL algcmake)
6568
include(3di/algcmake)

cmake/lagrange/lagrange_warnings.cmake

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ include(lagrange_filter_flags)
3030
# When compiling on Windows
3131
# Applied for MSVC with Windows target and also for cross-compiling using other toolchains
3232
if(CMAKE_HOST_WIN32)
33-
target_compile_definitions(lagrange_warnings INTERFACE _USE_MATH_DEFINES)
3433
target_compile_definitions(lagrange_warnings INTERFACE _CRT_SECURE_NO_WARNINGS)
3534
target_compile_definitions(lagrange_warnings INTERFACE _ENABLE_EXTENDED_ALIGNED_STORAGE)
3635
target_compile_definitions(lagrange_warnings INTERFACE NOMINMAX)
@@ -222,3 +221,17 @@ else()
222221
target_compile_options(lagrange_warnings INTERFACE ${options})
223222
endif()
224223

224+
function(lagrange_add_warnings target)
225+
get_target_property(target_type ${target} TYPE)
226+
if(target_type STREQUAL "INTERFACE_LIBRARY")
227+
if(LAGRANGE_PROPAGATE_WARNINGS)
228+
target_link_libraries(${target} INTERFACE lagrange::warnings)
229+
endif()
230+
else()
231+
if(LAGRANGE_PROPAGATE_WARNINGS)
232+
target_link_libraries(${target} PUBLIC lagrange::warnings)
233+
else()
234+
target_link_libraries(${target} PRIVATE lagrange::warnings)
235+
endif()
236+
endif()
237+
endfunction()

cmake/recipes/external/Boost.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ set(BOOST_INCLUDE_LIBRARIES
4545
lockfree
4646
log
4747
math
48+
multiprecision
4849
numeric/conversion
4950
numeric/interval
5051
numeric/ublas

0 commit comments

Comments
 (0)