diff --git a/CMakeLists.txt b/CMakeLists.txt index 218e53add..a3c2eca12 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -426,6 +426,7 @@ endif() find_package(OpenVDB 5.0 REQUIRED COMPONENTS openvdb) if(OpenVDB_FOUND) slic3r_remap_configs(IlmBase::Half RelWithDebInfo Release) + slic3r_remap_configs(Blosc::blosc RelWithDebInfo Release) endif() set(TOP_LEVEL_PROJECT_DIR ${PROJECT_SOURCE_DIR}) diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake index 7bc44bebb..b9d19ed1e 100644 --- a/cmake/modules/FindOpenVDB.cmake +++ b/cmake/modules/FindOpenVDB.cmake @@ -247,7 +247,7 @@ foreach(COMPONENT ${OpenVDB_FIND_COMPONENTS}) set(OpenVDB_${COMPONENT}_LIBRARY ${OpenVDB_${COMPONENT}_LIBRARY_${_BUILD_TYPE}}) - if (NOT MSVC AND NOT OpenVDB_${COMPONENT}_LIBRARY) + if (NOT OpenVDB_${COMPONENT}_LIBRARY) set(OpenVDB_${COMPONENT}_LIBRARY ${OpenVDB_${COMPONENT}_LIBRARY_RELEASE}) endif () diff --git a/sandboxes/meshboolean/MeshBoolean.cpp b/sandboxes/meshboolean/MeshBoolean.cpp index 3fd45ccff..d339ef5c3 100644 --- a/sandboxes/meshboolean/MeshBoolean.cpp +++ b/sandboxes/meshboolean/MeshBoolean.cpp @@ -19,7 +19,7 @@ int main(const int argc, const char * argv[]) { using namespace Slic3r; - if (argc < 1) return EXIT_FAILURE; + if (argc <= 1) return EXIT_FAILURE; DynamicPrintConfig cfg; auto model = Model::read_from_file(argv[1], &cfg); diff --git a/sandboxes/opencsg/CMakeLists.txt b/sandboxes/opencsg/CMakeLists.txt index e9a51b0f4..ec1f4cae9 100644 --- a/sandboxes/opencsg/CMakeLists.txt +++ b/sandboxes/opencsg/CMakeLists.txt @@ -20,6 +20,7 @@ target_link_libraries(opencsg_example libslic3r) target_include_directories(opencsg_example PRIVATE ${wxWidgets_INCLUDE_DIRS}) target_compile_definitions(opencsg_example PRIVATE ${wxWidgets_DEFINITIONS}) +slic3r_remap_configs(OpenCSG::opencsg RelWithDebInfo Release) target_link_libraries(opencsg_example ${wxWidgets_LIBRARIES} OpenCSG::opencsg GLEW::GLEW