3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build issues on Windows

Browse Source
This commit is contained in:
tamasmeszaros 2020-01-16 14:25:01 +01:00
parent fada7224f1
commit a1dc7a5c41
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -426,6 +426,7 @@ endif()
find_package(OpenVDB 5.0 REQUIRED COMPONENTS openvdb) find_package(OpenVDB 5.0 REQUIRED COMPONENTS openvdb)
if(OpenVDB_FOUND) if(OpenVDB_FOUND)
slic3r_remap_configs(IlmBase::Half RelWithDebInfo Release) slic3r_remap_configs(IlmBase::Half RelWithDebInfo Release)
slic3r_remap_configs(Blosc::blosc RelWithDebInfo Release)
endif() endif()
set(TOP_LEVEL_PROJECT_DIR ${PROJECT_SOURCE_DIR}) set(TOP_LEVEL_PROJECT_DIR ${PROJECT_SOURCE_DIR})

2
cmake/modules/FindOpenVDB.cmake
View File

@ -247,7 +247,7 @@ foreach(COMPONENT ${OpenVDB_FIND_COMPONENTS})
set(OpenVDB_${COMPONENT}_LIBRARY ${OpenVDB_${COMPONENT}_LIBRARY_${_BUILD_TYPE}}) 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}) set(OpenVDB_${COMPONENT}_LIBRARY ${OpenVDB_${COMPONENT}_LIBRARY_RELEASE})
endif () endif ()

2
sandboxes/meshboolean/MeshBoolean.cpp
View File

@ -19,7 +19,7 @@ int main(const int argc, const char * argv[])
{ {
using namespace Slic3r; using namespace Slic3r;
if (argc < 1) return EXIT_FAILURE; if (argc <= 1) return EXIT_FAILURE;
DynamicPrintConfig cfg; DynamicPrintConfig cfg;
auto model = Model::read_from_file(argv[1], &cfg); auto model = Model::read_from_file(argv[1], &cfg);

1
sandboxes/opencsg/CMakeLists.txt
View File

@ -20,6 +20,7 @@ target_link_libraries(opencsg_example libslic3r)
target_include_directories(opencsg_example PRIVATE ${wxWidgets_INCLUDE_DIRS}) target_include_directories(opencsg_example PRIVATE ${wxWidgets_INCLUDE_DIRS})
target_compile_definitions(opencsg_example PRIVATE ${wxWidgets_DEFINITIONS}) target_compile_definitions(opencsg_example PRIVATE ${wxWidgets_DEFINITIONS})
slic3r_remap_configs(OpenCSG::opencsg RelWithDebInfo Release)
target_link_libraries(opencsg_example ${wxWidgets_LIBRARIES} target_link_libraries(opencsg_example ${wxWidgets_LIBRARIES}
OpenCSG::opencsg OpenCSG::opencsg
GLEW::GLEW GLEW::GLEW