[Bf-blender-cvs] [4ed78f0f628] quadriflow: More quadriflow cmake tweaks
Sebastian Parborg
noreply at git.blender.org
Thu Sep 5 14:24:01 CEST 2019
Commit: 4ed78f0f628fdf7cf194a10c6056557a5beb3b04
Author: Sebastian Parborg
Date: Thu Sep 5 14:24:31 2019 +0200
Branches: quadriflow
https://developer.blender.org/rB4ed78f0f628fdf7cf194a10c6056557a5beb3b04
More quadriflow cmake tweaks
===================================================================
M CMakeLists.txt
M extern/quadriflow/CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f2f0d0cdd3..8d00da4ddcc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1768,6 +1768,7 @@ if(FIRST_RUN)
info_cfg_option(WITH_OPENIMAGEDENOISE)
info_cfg_option(WITH_OPENVDB)
info_cfg_option(WITH_ALEMBIC)
+ info_cfg_option(WITH_QUADRIFLOW)
info_cfg_text("Compiler Options:")
info_cfg_option(WITH_BUILDINFO)
diff --git a/extern/quadriflow/CMakeLists.txt b/extern/quadriflow/CMakeLists.txt
index 6960dc378f5..bb794e31c42 100644
--- a/extern/quadriflow/CMakeLists.txt
+++ b/extern/quadriflow/CMakeLists.txt
@@ -12,7 +12,7 @@ set(LEMON_SOURCE_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/${LEMON_3RD_PATH})
set(LEMON_SRC ${LEMON_SOURCE_ROOT_DIR}/lemon)
set(LEMON_INCLUDE_DIRS ${LEMON_SOURCE_ROOT_DIR})
-CONFIGURE_FILE(
+configure_file(
${LEMON_SRC}/config.h.in
${LEMON_SRC}/config.h
)
@@ -30,12 +30,12 @@ set(INC
src
3rd/pcg32
3rd/pss
- ${BOOST_INCLUDE_DIR}
- ${EIGEN3_INCLUDE_DIRS}
${LEMON_INCLUDE_DIRS}
)
set(INC_SYS
+ ${BOOST_INCLUDE_DIR}
+ ${EIGEN3_INCLUDE_DIRS}
)
set(SRC
More information about the Bf-blender-cvs
mailing list