diff options
author | tamasmeszaros <meszaros.q@gmail.com> | 2020-01-16 17:19:46 +0300 |
---|---|---|
committer | tamasmeszaros <meszaros.q@gmail.com> | 2020-01-16 17:19:46 +0300 |
commit | ea6844c31da7f31980cc3265e8d170dc8dd5608b (patch) | |
tree | daa440f4c26bd0ca226ca4259ac13ccd86b40970 /cmake/modules | |
parent | a1dc7a5c41102c991bab3aed0682cef7d7a9582a (diff) |
Follow up for Windows build fixes
Diffstat (limited to 'cmake/modules')
-rw-r--r-- | cmake/modules/FindOpenVDB.cmake | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake index b9d19ed1e..6d3bc06ec 100644 --- a/cmake/modules/FindOpenVDB.cmake +++ b/cmake/modules/FindOpenVDB.cmake @@ -242,6 +242,8 @@ foreach(COMPONENT ${OpenVDB_FIND_COMPONENTS}) else() set(OpenVDB_${COMPONENT}_FOUND FALSE) endif() + + set(OpenVDB_${COMPONENT}_LIBRARY ${OpenVDB_${COMPONENT}_LIBRARY_RELEASE}) else () string(TOUPPER "${CMAKE_BUILD_TYPE}" _BUILD_TYPE) @@ -259,6 +261,7 @@ foreach(COMPONENT ${OpenVDB_FIND_COMPONENTS}) set(OpenVDB_${COMPONENT}_FOUND FALSE) endif() endif () + endforeach() if(UNIX AND OPENVDB_USE_STATIC_LIBS) @@ -522,18 +525,17 @@ foreach(COMPONENT ${OpenVDB_FIND_COMPONENTS}) IMPORTED_LINK_DEPENDENT_LIBRARIES "${_OPENVDB_HIDDEN_DEPENDENCIES}" # non visible deps INTERFACE_LINK_LIBRARIES "${_OPENVDB_VISIBLE_DEPENDENCIES}" # visible deps (headers) INTERFACE_COMPILE_FEATURES cxx_std_11 - ) - - if (_is_multi) - set_target_properties(OpenVDB::${COMPONENT} PROPERTIES + IMPORTED_LOCATION "${OpenVDB_${COMPONENT}_LIBRARY}" IMPORTED_LOCATION_RELEASE "${OpenVDB_${COMPONENT}_LIBRARY_RELEASE}" IMPORTED_LOCATION_DEBUG "${OpenVDB_${COMPONENT}_LIBRARY_DEBUG}" - ) - else () - set_target_properties(OpenVDB::${COMPONENT} PROPERTIES - IMPORTED_LOCATION "${OpenVDB_${COMPONENT}_LIBRARY}" - ) - endif () + ) + + # if (_is_multi) + # set_target_properties(OpenVDB::${COMPONENT} PROPERTIES + # IMPORTED_LOCATION_RELEASE "${OpenVDB_${COMPONENT}_LIBRARY_RELEASE}" + # IMPORTED_LOCATION_DEBUG "${OpenVDB_${COMPONENT}_LIBRARY_DEBUG}" + # ) + # endif () if (OPENVDB_USE_STATIC_LIBS) set_target_properties(OpenVDB::${COMPONENT} PROPERTIES |