From 9f085c133ab56294db9f7df6e9b987fb3d2b8683 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Mon, 27 Jan 2020 12:45:20 +0100 Subject: [PATCH 1/2] Try to fix cmake - openvdb on mac --- cmake/modules/FindOpenVDB.cmake | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake index 48f0d6655..18fecf6c5 100644 --- a/cmake/modules/FindOpenVDB.cmake +++ b/cmake/modules/FindOpenVDB.cmake @@ -233,7 +233,10 @@ foreach(COMPONENT ${OpenVDB_FIND_COMPONENTS}) ) if (_is_multi) - list(APPEND OpenVDB_LIB_COMPONENTS ${OpenVDB_${COMPONENT}_LIBRARY_RELEASE} ${OpenVDB_${COMPONENT}_LIBRARY_DEBUG}) + list(APPEND OpenVDB_LIB_COMPONENTS ${OpenVDB_${COMPONENT}_LIBRARY_RELEASE}) + if (MSVC OR OpenVDB_${COMPONENT}_LIBRARY_DEBUG) + list(APPEND OpenVDB_LIB_COMPONENTS ${OpenVDB_${COMPONENT}_LIBRARY_DEBUG}) + endif () list(FIND CMAKE_CONFIGURATION_TYPES "Debug" _has_debug) @@ -538,8 +541,13 @@ foreach(COMPONENT ${OpenVDB_FIND_COMPONENTS}) if (_is_multi) set_target_properties(OpenVDB::${COMPONENT} PROPERTIES IMPORTED_LOCATION_RELEASE "${OpenVDB_${COMPONENT}_LIBRARY_RELEASE}" - IMPORTED_LOCATION_DEBUG "${OpenVDB_${COMPONENT}_LIBRARY_DEBUG}" ) + + if (MSVC OR OpenVDB_${COMPONENT}_LIBRARY_DEBUG) + set_target_properties(OpenVDB::${COMPONENT} PROPERTIES + IMPORTED_LOCATION_DEBUG "${OpenVDB_${COMPONENT}_LIBRARY_DEBUG}" + ) + endif () endif () if (OPENVDB_USE_STATIC_LIBS) From 3e5dce771fa0f6de61d50171ba7bb2c53ae58eeb Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Mon, 27 Jan 2020 13:51:44 +0100 Subject: [PATCH 2/2] Set OpenVDB_FOUND if no debug but release is there and not on MSVC --- cmake/modules/FindOpenVDB.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake index 18fecf6c5..bddc346b9 100644 --- a/cmake/modules/FindOpenVDB.cmake +++ b/cmake/modules/FindOpenVDB.cmake @@ -240,7 +240,7 @@ foreach(COMPONENT ${OpenVDB_FIND_COMPONENTS}) list(FIND CMAKE_CONFIGURATION_TYPES "Debug" _has_debug) - if(OpenVDB_${COMPONENT}_LIBRARY_RELEASE AND (_has_debug LESS 0 OR OpenVDB_${COMPONENT}_LIBRARY_DEBUG)) + if(OpenVDB_${COMPONENT}_LIBRARY_RELEASE AND (NOT MSVC OR _has_debug LESS 0 OR OpenVDB_${COMPONENT}_LIBRARY_DEBUG)) set(OpenVDB_${COMPONENT}_FOUND TRUE) else() set(OpenVDB_${COMPONENT}_FOUND FALSE)