griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Removed auto generated config.h file from quadriflow

Browse Source 
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.
This commit is contained in:
Sebastian Parborg
2019-09-25 15:53:38 +02:00
parent f9ef0e1bde
commit b651ac6531
2 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
extern/quadriflow/3rd/lemon-1.3.1/lemon/config.h vendored
View File

@@ -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 */

4
extern/quadriflow/CMakeLists.txt vendored
View File

@@ -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