diff options
| author | Michael J. Chudobiak <mjc@avtechpulse.com> | 2012-07-19 09:10:22 -0400 |
|---|---|---|
| committer | Michael J. Chudobiak <mjc@avtechpulse.com> | 2012-07-19 09:10:22 -0400 |
| commit | 3e81b648cfb865117b3b434029a549b2672ed5bc (patch) | |
| tree | 82821a191ecc258de67393e7b7f862b501cf9275 | |
| parent | 50506ef3771ce833d76cf29a16d5f1acc288453e (diff) | |
link libraries properly
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | build/Makefile | 8 | ||||
| -rw-r--r-- | build/cmake_install.cmake | 6 | ||||
| -rw-r--r-- | instr-client.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d7d8e9..d0faa1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g") add_executable(instr-daemon instr-daemon.c signalobject.c response.c) add_executable(instr-client instr-client.c) -target_link_libraries(instr-daemon gio-2.0) -target_link_libraries(instr-client gio-2.0) +target_link_libraries(instr-daemon gio-2.0 gobject-2.0 glib-2.0) +target_link_libraries(instr-client gio-2.0 gobject-2.0 glib-2.0) diff --git a/build/Makefile b/build/Makefile index e10303e..b8e7243 100644 --- a/build/Makefile +++ b/build/Makefile @@ -39,10 +39,10 @@ RM = /usr/bin/cmake -E remove -f CMAKE_EDIT_COMMAND = /usr/bin/ccmake # The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /fileserver2/home/mjc/git/Instrument +CMAKE_SOURCE_DIR = /fileserver2/home/mjclab2/git/Instrument # The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /fileserver2/home/mjc/git/Instrument/build +CMAKE_BINARY_DIR = /fileserver2/home/mjclab2/git/Instrument/build #============================================================================= # Targets provided globally by CMake. @@ -69,9 +69,9 @@ rebuild_cache/fast: rebuild_cache # The main all target all: cmake_check_build_system - $(CMAKE_COMMAND) -E cmake_progress_start /fileserver2/home/mjc/git/Instrument/build/CMakeFiles /fileserver2/home/mjc/git/Instrument/build/CMakeFiles/progress.marks + $(CMAKE_COMMAND) -E cmake_progress_start /fileserver2/home/mjclab2/git/Instrument/build/CMakeFiles /fileserver2/home/mjclab2/git/Instrument/build/CMakeFiles/progress.marks $(MAKE) -f CMakeFiles/Makefile2 all - $(CMAKE_COMMAND) -E cmake_progress_start /fileserver2/home/mjc/git/Instrument/build/CMakeFiles 0 + $(CMAKE_COMMAND) -E cmake_progress_start /fileserver2/home/mjclab2/git/Instrument/build/CMakeFiles 0 .PHONY : all # The main clean target diff --git a/build/cmake_install.cmake b/build/cmake_install.cmake index aac7ddf..dd923b5 100644 --- a/build/cmake_install.cmake +++ b/build/cmake_install.cmake @@ -1,4 +1,4 @@ -# Install script for directory: /fileserver2/home/mjc/git/Instrument +# Install script for directory: /fileserver2/home/mjclab2/git/Instrument # Set the install prefix IF(NOT DEFINED CMAKE_INSTALL_PREFIX) @@ -38,7 +38,7 @@ ELSE(CMAKE_INSTALL_COMPONENT) SET(CMAKE_INSTALL_MANIFEST "install_manifest.txt") ENDIF(CMAKE_INSTALL_COMPONENT) -FILE(WRITE "/fileserver2/home/mjc/git/Instrument/build/${CMAKE_INSTALL_MANIFEST}" "") +FILE(WRITE "/fileserver2/home/mjclab2/git/Instrument/build/${CMAKE_INSTALL_MANIFEST}" "") FOREACH(file ${CMAKE_INSTALL_MANIFEST_FILES}) - FILE(APPEND "/fileserver2/home/mjc/git/Instrument/build/${CMAKE_INSTALL_MANIFEST}" "${file}\n") + FILE(APPEND "/fileserver2/home/mjclab2/git/Instrument/build/${CMAKE_INSTALL_MANIFEST}" "${file}\n") ENDFOREACH(file) diff --git a/instr-client.c b/instr-client.c index 0269f61..7298774 100644 --- a/instr-client.c +++ b/instr-client.c @@ -140,4 +140,4 @@ int main(int argc, char** argv) g_source_attach(inSource, NULL); g_main_loop_run (g_main_loop_new (NULL, FALSE)); return 0; -}
\ No newline at end of file +} |