AuroraMiddleware/UVAtlas
1
0
Fork 0
mirror of https://github.com/microsoft/UVAtlas synced 2024-09-18 22:00:04 +00:00
Code Issues Projects Releases Wiki Activity

CMake targets fixes for optional vs. required packages (#121)

Browse Source
This commit is contained in:
Chuck Walbourn 2023-06-16 11:51:57 -07:00 committed by GitHub
parent 122672631a
commit df9804d20a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -171,7 +171,7 @@ if(ENABLE_USE_EIGEN)
message(STATUS "Using Eigen3 & Spectra for CSymmetricMatrix::GetEigen.")
find_package(Eigen3 REQUIRED)
find_package(spectra REQUIRED)
target_link_libraries(${PROJECT_NAME} PRIVATE Eigen3::Eigen Spectra::Spectra)
target_link_libraries(${PROJECT_NAME} PUBLIC Eigen3::Eigen Spectra::Spectra)
target_compile_definitions(${PROJECT_NAME} PRIVATE UVATLAS_USE_EIGEN)
endif()
@ -254,7 +254,7 @@ if(BUILD_TOOLS AND WIN32)
UVAtlasTool/Mesh.h
UVAtlasTool/MeshOBJ.cpp
UVAtlasTool/SDKMesh.h)
target_link_libraries(uvatlastool
target_link_libraries(uvatlastool PRIVATE
${PROJECT_NAME}
ole32.lib version.lib
Microsoft::DirectXMesh
@ -263,11 +263,11 @@ if(BUILD_TOOLS AND WIN32)
source_group(uvatlastool REGULAR_EXPRESSION UVAtlasTool/*.*)
if(UVATLAS_USE_OPENMP)
target_link_libraries(uvatlastool OpenMP::OpenMP_CXX)
target_link_libraries(uvatlastool PRIVATE OpenMP::OpenMP_CXX)
endif()
if(directxmath_FOUND)
target_link_libraries(uvatlastool Microsoft::DirectXMath)
target_link_libraries(uvatlastool PRIVATE Microsoft::DirectXMath)
endif()
endif()

7
build/UVAtlas-config.cmake.in
View File

@ -15,8 +15,11 @@ if (ENABLE_USE_EIGEN)
endif()
if(MINGW OR (NOT WIN32))
find_dependency(directx-headers CONFIG)
find_dependency(directxmath CONFIG)
find_dependency(directx-headers)
find_dependency(directxmath)
else()
find_package(directx-headers CONFIG QUIET)
find_package(directxmath CONFIG QUIET)
endif()
check_required_components("@PROJECT_NAME@")