[Bf-blender-cvs] [b651ac6531d] master: Removed auto generated config.h file from quadriflow

[Sebastian Parborg]

Commit: b651ac6531d9dbbdadfa432bc825fa5b515a523a
Author: Sebastian Parborg
Date:   Wed Sep 25 15:53:38 2019 +0200
Branches: master
https://developer.blender.org/rBb651ac6531d9dbbdadfa432bc825fa5b515a523a

Removed auto generated config.h file from quadriflow

The config.h file is autogenerated during compile by a 3rd party library
quadriflow uses. Now we put this file in the build directory to avoid
adding this to the git repository in the future.

===================================================================

D	extern/quadriflow/3rd/lemon-1.3.1/lemon/config.h
M	extern/quadriflow/CMakeLists.txt

===================================================================

diff --git a/extern/quadriflow/3rd/lemon-1.3.1/lemon/config.h b/extern/quadriflow/3rd/lemon-1.3.1/lemon/config.h
deleted file mode 100644
index b9699a223fb..00000000000
--- a/extern/quadriflow/3rd/lemon-1.3.1/lemon/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#define LEMON_VERSION ""
-/* #undef LEMON_HAVE_LONG_LONG */
-
-/* #undef LEMON_HAVE_LP */
-/* #undef LEMON_HAVE_MIP */
-/* #undef LEMON_HAVE_GLPK */
-/* #undef LEMON_HAVE_CPLEX */
-/* #undef LEMON_HAVE_SOPLEX */
-/* #undef LEMON_HAVE_CLP */
-/* #undef LEMON_HAVE_CBC */
-
-#define _LEMON_CPLEX 1
-#define _LEMON_CLP 2
-#define _LEMON_GLPK 3
-#define _LEMON_SOPLEX 4
-#define _LEMON_CBC 5
-
-/* #undef LEMON_DEFAULT_LP */
-/* #undef LEMON_DEFAULT_MIP */
-
-/* #undef LEMON_USE_PTHREAD */
-/* #undef LEMON_USE_WIN32_THREADS */
diff --git a/extern/quadriflow/CMakeLists.txt b/extern/quadriflow/CMakeLists.txt
index 488d95a48b9..3891079073e 100644
--- a/extern/quadriflow/CMakeLists.txt
+++ b/extern/quadriflow/CMakeLists.txt
@@ -39,9 +39,10 @@ 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})
 
+set(LEMON_GEN_DIR ${CMAKE_BINARY_DIR}/extern/quadriflow/${LEMON_3RD_PATH})
 configure_file(
   ${LEMON_SRC}/config.h.in
-  ${LEMON_SRC}/config.h
+  ${LEMON_GEN_DIR}/lemon/config.h
   )
 set(LEMON_SOURCES
   ${LEMON_SRC}/arg_parser.cc
@@ -58,6 +59,7 @@ set(INC
   3rd/pcg32
   3rd/pss
   ${LEMON_INCLUDE_DIRS}
+  ${LEMON_GEN_DIR}
 )
 
 set(INC_SYS