Skip to content

Commit

Permalink
Merge pull request #637 from Autodesk/donnels/use_proper_boost_targets
Browse files Browse the repository at this point in the history
Use proper boost target name
  • Loading branch information
Krystian Ligenza authored Jul 14, 2020
2 parents 254a919 + 86943fd commit 954c767
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion plugin/al/lib/AL_USDMaya/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,15 @@ target_include_directories(
$<$<BOOL:${UFE_FOUND}>:${UFE_INCLUDE_DIR}>
)

# There were bugs in both cmake and findboost with the boost version string. So in
# order to support all boost and cmake versions, we check how the boost version is
# defined and create our version comparison string.
if(${Boost_VERSION} MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)$")
set(boost_1_70_0_ver_string "1.70.0")
else()
set(boost_1_70_0_ver_string "107000")
endif()

target_link_libraries(${LIBRARY_NAME}
AL_EventSystem
AL_USDMayaUtils
Expand All @@ -201,7 +210,7 @@ target_link_libraries(${LIBRARY_NAME}
usdImagingGL
vt
Boost::python
$<IF:$<BOOL:${IS_WINDOWS}>,Boost::thread,${Boost_THREAD_LIBRARY}>
$<IF:$<VERSION_GREATER_EQUAL:${Boost_VERSION},${boost_1_70_0_ver_string}>,Boost::thread,${Boost_THREAD_LIBRARY}>
$<$<BOOL:${IS_WINDOWS}>:Boost::chrono>
$<$<BOOL:${IS_WINDOWS}>:Boost::date_time>
$<$<BOOL:${NEED_BOOST_FILESYSTEM}>:Boost::filesystem>
Expand Down

0 comments on commit 954c767

Please sign in to comment.