Commit c4d56ab9 authored by Arnaud Blanchard's avatar Arnaud Blanchard
Browse files

adapt to other project

parent 1647c1ff
......@@ -16,13 +16,13 @@ add_definitions(-Wall -Wextra -Wno-multichar)
get_filename_component(BLAAR_DIR ${CMAKE_SOURCE_DIR} PATH)
if (NOT TARGET shared_blc_core)
add_subdirectory(${BLAAR_DIR}/blc/blc_core blc_core)
add_subdirectory(${BLAAR_DIR}/blc_core blc_core)
endif()
if (NOT TARGET shared_blc_channel)
add_subdirectory(${BLAAR_DIR}/blc/blc_core blc_core)
add_subdirectory(${BLAAR_DIR}/blc_channel blc_channel)
endif()
if (NOT TARGET shared_blc_program)
add_subdirectory(${BLAAR_DIR}/blc/blc_core blc_core)
add_subdirectory(${BLAAR_DIR}/blc_program blc_program)
endif()
......@@ -37,7 +37,7 @@ add_library(static_blc_processes STATIC ${sources})
target_link_libraries(shared_blc_processes shared_blc_program shared_blc_channel shared_blc_core)
set(BLC_PROCESSES_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include PARENT_SCOPE)
set(BLC_PROCESSES_LIBRARY shared_blc_processes PARENT_SCOPE)
set(BLC_PROCESSES_LIBRARIES shared_blc_processes PARENT_SCOPE)
#Both librairies have the same name only the extension will change depending on the OS
......
......@@ -52,10 +52,9 @@ void blc_update_shared_files(blc_process **processes, int *processes_nb, blc_cha
{
blc_mem mem;
char buf[LINE_MAX];
char *path;
char *path, *str;
int stdout_pipe[2];
pid_t pid;
char *str=NULL, *previous;
char letter, access;
ssize_t n;
int status, pos, len;
......@@ -157,11 +156,7 @@ void blc_update_shared_files(blc_process **processes, int *processes_nb, blc_cha
str=strchr(str, '\n')+1;
break;
}
<<<<<<< HEAD
=======
previous=str;
>>>>>>> 3b53ad12f058cbacd7e0a3a46143dcb6df0cd7e2
str+=pos;
}while(str[0]!=0);
mem.allocate(0);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment