Commitdf9804d

authored

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

1 parent1226726 commitdf9804dCopy full SHA for df9804d

File tree

-6

lines changed

-6

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ if(ENABLE_USE_EIGEN)`
`171`	`171`	`message(STATUS"Using Eigen3 & Spectra for CSymmetricMatrix::GetEigen.")`
`172`	`172`	`find_package(Eigen3 REQUIRED)`
`173`	`173`	`find_package(spectra REQUIRED)`
`174`		`- target_link_libraries(${PROJECT_NAME}PRIVATE Eigen3::Eigen Spectra::Spectra)`
	`174`	`+ target_link_libraries(${PROJECT_NAME}PUBLIC Eigen3::Eigen Spectra::Spectra)`
`175`	`175`	`target_compile_definitions(${PROJECT_NAME}PRIVATE UVATLAS_USE_EIGEN)`
`176`	`176`	`endif()`
`177`	`177`
`@@ -254,7 +254,7 @@ if(BUILD_TOOLS AND WIN32)`
`254`	`254`	`UVAtlasTool/Mesh.h`
`255`	`255`	`UVAtlasTool/MeshOBJ.cpp`
`256`	`256`	`UVAtlasTool/SDKMesh.h)`
`257`		`- target_link_libraries(uvatlastool`
	`257`	`+ target_link_libraries(uvatlastoolPRIVATE`
`258`	`258`	`${PROJECT_NAME}`
`259`	`259`	`ole32.libversion.lib`
`260`	`260`	`Microsoft::DirectXMesh`
`@@ -263,11 +263,11 @@ if(BUILD_TOOLS AND WIN32)`
`263`	`263`	`source_group(uvatlastoolREGULAR_EXPRESSION UVAtlasTool/.)`
`264`	`264`
`265`	`265`	`if(UVATLAS_USE_OPENMP)`
`266`		`- target_link_libraries(uvatlastool OpenMP::OpenMP_CXX)`
	`266`	`+ target_link_libraries(uvatlastoolPRIVATEOpenMP::OpenMP_CXX)`
`267`	`267`	`endif()`
`268`	`268`
`269`	`269`	`if(directxmath_FOUND)`
`270`		`- target_link_libraries(uvatlastool Microsoft::DirectXMath)`
	`270`	`+ target_link_libraries(uvatlastoolPRIVATEMicrosoft::DirectXMath)`
`271`	`271`	`endif()`
`272`	`272`	`endif()`
`273`	`273`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,11 @@ if (ENABLE_USE_EIGEN)`
`15`	`15`	`endif()`
`16`	`16`
`17`	`17`	`if(MINGWOR (NOTWIN32))`
`18`		`- find_dependency(directx-headers CONFIG)`
`19`		`- find_dependency(directxmath CONFIG)`
	`18`	`+ find_dependency(directx-headers)`
	`19`	`+ find_dependency(directxmath)`
	`20`	`+else()`
	`21`	`+ find_package(directx-headers CONFIGQUIET)`
	`22`	`+ find_package(directxmath CONFIGQUIET)`
`20`	`23`	`endif()`
`21`	`24`
`22`	`25`	`check_required_components("@PROJECT_NAME@")`

Comments

(0)