fixed merge conflict in CMakeLists.txt
This commit is contained in:
parent
e6a6efe517
commit
b48efc8841
1 changed files with 3 additions and 0 deletions
|
|
@ -51,6 +51,7 @@ SET (DEP_LIBS
|
||||||
-ldl
|
-ldl
|
||||||
-ljson-glib-1.0
|
-ljson-glib-1.0
|
||||||
-lgobject-2.0
|
-lgobject-2.0
|
||||||
|
-luuid
|
||||||
)
|
)
|
||||||
|
|
||||||
# JSON-GLIB
|
# JSON-GLIB
|
||||||
|
|
@ -120,10 +121,12 @@ ADD_EXECUTABLE (${PROJECT_NAME}
|
||||||
${UTILS_DIR}/gconf_file.c
|
${UTILS_DIR}/gconf_file.c
|
||||||
${UTILS_DIR}/glib_utils.c
|
${UTILS_DIR}/glib_utils.c
|
||||||
${UTILS_DIR}/json_parser.c
|
${UTILS_DIR}/json_parser.c
|
||||||
|
${UTILS_DIR}/json_writer.c
|
||||||
${UTILS_DIR}/jwt.c
|
${UTILS_DIR}/jwt.c
|
||||||
${UTILS_DIR}/library.c
|
${UTILS_DIR}/library.c
|
||||||
${UTILS_DIR}/logger.c
|
${UTILS_DIR}/logger.c
|
||||||
${UTILS_DIR}/str_t.c
|
${UTILS_DIR}/str_t.c
|
||||||
|
${UTILS_DIR}/uuid.c
|
||||||
${FCGISRV_DIR}/fcgi_map.c
|
${FCGISRV_DIR}/fcgi_map.c
|
||||||
${FCGISRV_DIR}/fcgi_server.c
|
${FCGISRV_DIR}/fcgi_server.c
|
||||||
${FCGISRV_DIR}/fcgi_thread.c
|
${FCGISRV_DIR}/fcgi_thread.c
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue