[Bf-blender-cvs] [76c4be4ee98] quadriflow: Updated build files based on feedback
Sebastian Parborg
noreply at git.blender.org
Wed Sep 4 17:33:09 CEST 2019
Commit: 76c4be4ee989f819b47a379e7046481411647e78
Author: Sebastian Parborg
Date: Wed Sep 4 17:31:49 2019 +0200
Branches: quadriflow
https://developer.blender.org/rB76c4be4ee989f819b47a379e7046481411647e78
Updated build files based on feedback
===================================================================
M extern/quadriflow/CMakeLists.txt
D extern/quadriflow/blender_config.cmake
M intern/quadriflow/CMakeLists.txt
M source/blender/editors/object/object_remesh.c
===================================================================
diff --git a/extern/quadriflow/CMakeLists.txt b/extern/quadriflow/CMakeLists.txt
index 01de5191a20..6960dc378f5 100644
--- a/extern/quadriflow/CMakeLists.txt
+++ b/extern/quadriflow/CMakeLists.txt
@@ -1,14 +1,10 @@
-cmake_minimum_required(VERSION 3.1)
-project(QuadriFlow LANGUAGES CXX)
-
-if(DEFINED QUADRIFLOW_CMAKE_CFG)
- include(${QUADRIFLOW_CMAKE_CFG})
-endif()
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
+if (WIN32)
+ add_definitions(-D_USE_MATH_DEFINES)
+endif()
+
set(LEMON_3RD_PATH 3rd/lemon-1.3.1)
set(LEMON_SOURCE_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/${LEMON_3RD_PATH})
@@ -30,49 +26,19 @@ set(LEMON_SOURCES
${LEMON_SRC}/bits/windows.cc
)
-include_directories(src)
-include_directories(3rd/pcg32)
-include_directories(3rd/pss)
-include_directories(${Boost_INCLUDE_DIRS})
-include_directories(${EIGEN_INCLUDE_DIRS})
-include_directories(${GLM_INCLUDE_DIRS})
-include_directories(${GLUT_INCLUDE_DIRS})
-include_directories(${LEMON_INCLUDE_DIRS})
-include_directories(${TBB_INCLUDE_DIRS})
-include_directories(${GUROBI_INCLUDE_DIRS})
-
-if (BUILD_PERFORMANCE_TEST)
- add_definitions(-DPERFORMANCE_TEST)
-endif(BUILD_PERFORMANCE_TEST)
-
-if (BUILD_OPENMP)
- add_definitions(-DWITH_OMP)
-endif(BUILD_OPENMP)
-
-if (BUILD_LOG)
- add_definitions(-DLOG_OUTPUT)
-endif(BUILD_LOG)
-
-if (BUILD_GUROBI)
- add_definitions(-DWITH_GUROBI)
-endif(BUILD_GUROBI)
-
-if (BUILD_TBB)
- add_definitions(-DWITH_TBB)
-endif(BUILD_TBB)
-
-if (BUILD_FREE_LICENSE)
- add_definitions(-DEIGEN_MPL2_ONLY)
-endif(BUILD_FREE_LICENSE)
+set(INC
+ src
+ 3rd/pcg32
+ 3rd/pss
+ ${BOOST_INCLUDE_DIR}
+ ${EIGEN3_INCLUDE_DIRS}
+ ${LEMON_INCLUDE_DIRS}
+)
-if(BUILD_STATIC_LIB)
- set(LIB_TYPE STATIC)
-else()
- set(LIB_TYPE SHARED)
-endif()
+set(INC_SYS
+)
-set(
- quadriflow_SRC
+set(SRC
src/adjacent-matrix.cpp
src/adjacent-matrix.hpp
src/compare-key.hpp
@@ -103,15 +69,10 @@ set(
src/serialize.hpp
src/subdivide.cpp
src/subdivide.hpp
+ ${LEMON_SOURCES}
)
-add_library( qflow ${LIB_TYPE}
- ${quadriflow_SRC}
- ${LEMON_SRC}
-)
-target_link_libraries(
- qflow
- ${TBB_LIBRARIES}
- ${LEMON_LIBRARIES}
- ${GUROBI_LIBRARIES}
+set(LIB
)
+
+blender_add_lib(extern_quadriflow "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/extern/quadriflow/blender_config.cmake b/extern/quadriflow/blender_config.cmake
deleted file mode 100644
index 19500d67774..00000000000
--- a/extern/quadriflow/blender_config.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-# Do NOT use CACHE behavior here, as this has the same effect as defining an option,
-# it exposes the setting in main CMake config (which we do not want here).
-
-set(QUADRIFLOW_STANDALONE FALSE)
-set(BUILD_PERFORMANCE_TEST FALSE)
-set(BUILD_LOG TRUE)
-set(BUILD_GUROBI FALSE)
-set(BUILD_OPENMP ${WITH_OPENMP})
-set(BUILD_TBB FALSE)
-set(BUILD_FREE_LICENSE FALSE) #If TRUE, remove LGPL code
-set(BUILD_STATIC_LIB TRUE)
-
-set(Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIR})
-set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIRS})
diff --git a/intern/quadriflow/CMakeLists.txt b/intern/quadriflow/CMakeLists.txt
index 7fad274551c..01b0eb15f36 100644
--- a/intern/quadriflow/CMakeLists.txt
+++ b/intern/quadriflow/CMakeLists.txt
@@ -25,7 +25,7 @@ set(INC
set(INC_SYS
../../extern/quadriflow/src
- ${Boost_INCLUDE_DIR}
+ ${BOOST_INCLUDE_DIR}
${EIGEN3_INCLUDE_DIRS}
)
@@ -35,7 +35,11 @@ set(SRC
)
set(LIB
- qflow
+ extern_quadriflow
)
+if (WIN32)
+ add_definitions(-D_USE_MATH_DEFINES)
+endif()
+
blender_add_lib(bf_intern_quadriflow "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/object/object_remesh.c b/source/blender/editors/object/object_remesh.c
index f647ecda2d5..29d249647f5 100644
--- a/source/blender/editors/object/object_remesh.c
+++ b/source/blender/editors/object/object_remesh.c
@@ -69,8 +69,6 @@
#include "object_intern.h" // own include
-#define WITH_SHARP
-
static bool object_remesh_poll(bContext *C)
{
Object *ob = CTX_data_active_object(C);
@@ -181,14 +179,10 @@ static int quadriflow_remesh_exec(bContext *C, wmOperator *op)
}
const int target_faces = RNA_int_get(op->ptr, "target_faces");
const int seed = RNA_int_get(op->ptr, "seed");
-#ifdef WITH_SHARP
+
const bool use_preserve_sharp = RNA_boolean_get(op->ptr, "use_preserve_sharp");
const bool use_preserve_border = RNA_boolean_get(op->ptr, "use_preserve_border");
-#else
- /* The preserve sharp feature is currently unstable and will crash in certain scenarios */
- const bool use_preserve_sharp = false;
- const bool use_preserve_border = false;
-#endif
+
const bool use_adaptive_scale = RNA_boolean_get(op->ptr, "use_adaptive_scale");
const bool preserve_paint_mask = RNA_boolean_get(op->ptr, "preserve_paint_mask");
@@ -219,7 +213,7 @@ static int quadriflow_remesh_exec(bContext *C, wmOperator *op)
}
if (smooth_normals) {
- BKE_mesh_smooth_flag_set(ob, true);
+ BKE_mesh_smooth_flag_set(ob->data, true);
}
if (ob->mode == OB_MODE_SCULPT) {
@@ -251,7 +245,6 @@ void OBJECT_OT_quadriflow_remesh(wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
-#ifdef WITH_SHARP
RNA_def_boolean(ot->srna,
"use_preserve_sharp",
false,
@@ -263,7 +256,7 @@ void OBJECT_OT_quadriflow_remesh(wmOperatorType *ot)
false,
"Preserve mesh borders",
"Try to preserve mesh borders on the mesh");
-#endif
+
RNA_def_boolean(ot->srna,
"use_adaptive_scale",
false,
More information about the Bf-blender-cvs
mailing list