diff --git a/README.md b/README.md new file mode 100644 index 0000000..7603dbc --- /dev/null +++ b/README.md @@ -0,0 +1,14 @@ +# Nomad +An autonomous robot project. + +The Nomad project is an autonomous robot project initially being built for the 2016 Sparkfun Autonomous Vehicle Challenge (AVC). Nomad is built on (and named after) a heavily modified robot chassis kit from Actobotics called Nomad. + +The electronics consist of: +Primary computer: Intel Edison Arduino breakout board +Motor controller: Roboclaw 2x30 +Vision: Microsoft XBox Kinect + +The software for Nomad is written in Python using the Robot Operating System (ROS) framework. This framework breaks the processing into separate, independent nodes. The nodes are: +Joynode: Standard jotstick package from ROS. +roboclaw: A custom node built to interact with the Roboclaw motor controller via USB. The node leverages sample code provided by Orion Robotics to control the Roboclaw. The example code has been converted into a library for this project. +Nomad_control: A custom node built to convert commands from the joystick into direction and rotation commands for the motors. This is the node which will likely change the most throughout development. diff --git a/build/CMakeCache.txt b/build/CMakeCache.txt index baf56d5..7e1ae53 100644 --- a/build/CMakeCache.txt +++ b/build/CMakeCache.txt @@ -1,5 +1,9 @@ # This is the CMakeCache file. +<<<<<<< HEAD # For build in directory: /home/nomad/nomad_ws/build +======= +# For build in directory: /home/edison/nomad_ws/build +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # It was generated by CMake: /usr/bin/cmake # You can edit this file to change values found and used by cmake. # If you do not want to change any of the values, simply exit the editor. @@ -21,7 +25,11 @@ BUILD_SHARED_LIBS:BOOL=ON CATKIN_BLACKLIST_PACKAGES:STRING= //catkin devel space +<<<<<<< HEAD CATKIN_DEVEL_PREFIX:PATH=/home/nomad/nomad_ws/devel +======= +CATKIN_DEVEL_PREFIX:PATH=/home/edison/nomad_ws/devel +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 //Catkin enable testing CATKIN_ENABLE_TESTING:BOOL=ON @@ -35,6 +43,13 @@ CATKIN_WHITELIST_PACKAGES:STRING= //Path to a program. CMAKE_AR:FILEPATH=/usr/bin/ar +<<<<<<< HEAD +======= +//For backwards compatibility, what version of CMake commands and +// syntax should this version of CMake try to support. +CMAKE_BACKWARDS_COMPATIBILITY:STRING=2.4 + +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 //Choose the type of build, options are: None(CMAKE_CXX_FLAGS or // CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel. CMAKE_BUILD_TYPE:STRING= @@ -101,7 +116,11 @@ CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING= CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=OFF //Install path prefix, prepended onto install directories. +<<<<<<< HEAD CMAKE_INSTALL_PREFIX:PATH=/home/nomad/nomad_ws/install +======= +CMAKE_INSTALL_PREFIX:PATH=/home/edison/nomad_ws/install +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 //Path to a program. CMAKE_LINKER:FILEPATH=/usr/bin/ld @@ -173,6 +192,15 @@ CMAKE_USE_RELATIVE_PATHS:BOOL=OFF // Studio IDE projects all commands are done without /nologo. CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE +<<<<<<< HEAD +======= +//LSB Distrib tag +DEBIAN:BOOL=TRUE + +//LSB Distrib - codename tag +DEBIAN_WHEEZY:BOOL=TRUE + +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 //Path to a program. DOXYGEN_EXECUTABLE:FILEPATH=DOXYGEN_EXECUTABLE-NOTFOUND @@ -182,6 +210,12 @@ EMPY_EXECUTABLE:FILEPATH=/usr/bin/empy //Empy script EMPY_SCRIPT:STRING=/usr/bin/empy +<<<<<<< HEAD +======= +//Single output directory for building all executables. +EXECUTABLE_OUTPUT_PATH:PATH= + +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 //Path to a file. GTEST_INCLUDE_DIR:PATH=/usr/include @@ -197,8 +231,19 @@ GTEST_MAIN_LIBRARY:FILEPATH=GTEST_MAIN_LIBRARY-NOTFOUND //Path to a library. GTEST_MAIN_LIBRARY_DEBUG:FILEPATH=GTEST_MAIN_LIBRARY_DEBUG-NOTFOUND +<<<<<<< HEAD //Path to a program. LSB_RELEASE_EXECUTABLE:FILEPATH=LSB_RELEASE_EXECUTABLE-NOTFOUND +======= +//Single output directory for building all libraries. +LIBRARY_OUTPUT_PATH:PATH= + +//lsb_release executable was found +LSB_FOUND:BOOL=TRUE + +//Path to a program. +LSB_RELEASE_EXECUTABLE:FILEPATH=/usr/bin/lsb_release +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 //Path to a program. NOSETESTS:FILEPATH=/usr/bin/nosetests-2.7 @@ -210,6 +255,7 @@ PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python PYTHON_VERSION:STRING= //Value Computed by CMake +<<<<<<< HEAD Project_BINARY_DIR:STATIC=/home/nomad/nomad_ws/build //Value Computed by CMake @@ -217,6 +263,15 @@ Project_SOURCE_DIR:STATIC=/home/nomad/nomad_ws/src //Path to a library. RT_LIBRARY:FILEPATH=/usr/lib/arm-linux-gnueabihf/librt.so +======= +Project_BINARY_DIR:STATIC=/home/edison/nomad_ws/build + +//Value Computed by CMake +Project_SOURCE_DIR:STATIC=/home/edison/nomad_ws/src + +//Path to a library. +RT_LIBRARY:FILEPATH=/usr/lib/i386-linux-gnu/librt.so +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 //Enable debian style python package layout SETUPTOOLS_DEB_LAYOUT:BOOL=ON @@ -228,6 +283,7 @@ _CATKIN_GTEST_INCLUDE:FILEPATH=/usr/include/gtest/gtest.h _CATKIN_GTEST_SRC:FILEPATH=/usr/src/gtest/src/gtest.cc //The directory containing a CMake configuration file for catkin. +<<<<<<< HEAD catkin_DIR:PATH=/opt/ros/indigo/share/catkin/cmake //The directory containing a CMake configuration file for cpp_common. @@ -235,6 +291,15 @@ cpp_common_DIR:PATH=/opt/ros/indigo/share/cpp_common/cmake //Value Computed by CMake gtest_BINARY_DIR:STATIC=/home/nomad/nomad_ws/build/gtest +======= +catkin_DIR:PATH=/opt/ros/jade/share/catkin/cmake + +//The directory containing a CMake configuration file for cpp_common. +cpp_common_DIR:PATH=/opt/ros/jade/share/cpp_common/cmake + +//Value Computed by CMake +gtest_BINARY_DIR:STATIC=/home/edison/nomad_ws/build/gtest +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 //Dependencies for the target gtest_LIB_DEPENDS:STATIC=general;-lpthread; @@ -259,6 +324,7 @@ gtest_force_shared_crt:BOOL=OFF gtest_main_LIB_DEPENDS:STATIC=general;-lpthread;general;gtest; //Path to a library. +<<<<<<< HEAD lib:FILEPATH=/opt/ros/indigo/lib/libxmlrpcpp.so //The directory containing a CMake configuration file for message_runtime. @@ -296,6 +362,36 @@ std_msgs_DIR:PATH=/opt/ros/indigo/share/std_msgs/cmake //The directory containing a CMake configuration file for xmlrpcpp. xmlrpcpp_DIR:PATH=/opt/ros/indigo/share/xmlrpcpp/cmake +======= +lib:FILEPATH=/usr/lib/i386-linux-gnu/libpthread.so + +//The directory containing a CMake configuration file for message_runtime. +message_runtime_DIR:PATH=/opt/ros/jade/share/message_runtime/cmake + +//Value Computed by CMake +nomad_BINARY_DIR:STATIC=/home/edison/nomad_ws/build/nomad + +//Value Computed by CMake +nomad_SOURCE_DIR:STATIC=/home/edison/nomad_ws/src/nomad + +//The directory containing a CMake configuration file for roscpp_serialization. +roscpp_serialization_DIR:PATH=/opt/ros/jade/share/roscpp_serialization/cmake + +//The directory containing a CMake configuration file for roscpp_traits. +roscpp_traits_DIR:PATH=/opt/ros/jade/share/roscpp_traits/cmake + +//The directory containing a CMake configuration file for rospy. +rospy_DIR:PATH=/opt/ros/jade/share/rospy/cmake + +//The directory containing a CMake configuration file for rostime. +rostime_DIR:PATH=/opt/ros/jade/share/rostime/cmake + +//The directory containing a CMake configuration file for std.msgs. +std.msgs_DIR:PATH=std.msgs_DIR-NOTFOUND + +//The directory containing a CMake configuration file for std_msgs. +std_msgs_DIR:PATH=/opt/ros/jade/share/std_msgs/cmake +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ######################## @@ -303,8 +399,13 @@ xmlrpcpp_DIR:PATH=/opt/ros/indigo/share/xmlrpcpp/cmake ######################## //catkin environment +<<<<<<< HEAD CATKIN_ENV:INTERNAL=/home/nomad/nomad_ws/build/catkin_generated/env_cached.sh CATKIN_TEST_RESULTS_DIR:INTERNAL=/home/nomad/nomad_ws/build/test_results +======= +CATKIN_ENV:INTERNAL=/home/edison/nomad_ws/build/catkin_generated/env_cached.sh +CATKIN_TEST_RESULTS_DIR:INTERNAL=/home/edison/nomad_ws/build/test_results +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 //ADVANCED property for variable: CMAKE_AR CMAKE_AR-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_BUILD_TOOL @@ -312,7 +413,11 @@ CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1 //What is the target build tool cmake is generating for. CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/make //This is the directory where this CMakeCache.txt was created +<<<<<<< HEAD CMAKE_CACHEFILE_DIR:INTERNAL=/home/nomad/nomad_ws/build +======= +CMAKE_CACHEFILE_DIR:INTERNAL=/home/edison/nomad_ws/build +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 //Major version of cmake used to create the current loaded cache CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2 //Minor version of cmake used to create the current loaded cache @@ -383,7 +488,11 @@ CMAKE_HAVE_PTHREAD_CREATE:INTERNAL=1 CMAKE_HAVE_PTHREAD_H:INTERNAL=1 //Start directory with the top level CMakeLists.txt file for this // project +<<<<<<< HEAD CMAKE_HOME_DIRECTORY:INTERNAL=/home/nomad/nomad_ws/src +======= +CMAKE_HOME_DIRECTORY:INTERNAL=/home/edison/nomad_ws/src +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 //Install .so files without execute permission. CMAKE_INSTALL_SO_NO_EXE:INTERNAL=1 //ADVANCED property for variable: CMAKE_LINKER @@ -441,7 +550,11 @@ FIND_PACKAGE_MESSAGE_DETAILS_Threads:INTERNAL=[TRUE][v()] GTEST_FROM_SOURCE_FOUND:INTERNAL=TRUE GTEST_FROM_SOURCE_INCLUDE_DIRS:INTERNAL=/usr/include GTEST_FROM_SOURCE_LIBRARIES:INTERNAL=gtest +<<<<<<< HEAD GTEST_FROM_SOURCE_LIBRARY_DIRS:INTERNAL=/home/nomad/nomad_ws/build/gtest +======= +GTEST_FROM_SOURCE_LIBRARY_DIRS:INTERNAL=/home/edison/nomad_ws/build/gtest +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 GTEST_FROM_SOURCE_MAIN_LIBRARIES:INTERNAL=gtest_main //ADVANCED property for variable: GTEST_INCLUDE_DIR GTEST_INCLUDE_DIR-ADVANCED:INTERNAL=1 diff --git a/build/CMakeFiles/CMakeCCompiler.cmake b/build/CMakeFiles/CMakeCCompiler.cmake index 7063ed6..357f981 100644 --- a/build/CMakeFiles/CMakeCCompiler.cmake +++ b/build/CMakeFiles/CMakeCCompiler.cmake @@ -1,7 +1,11 @@ SET(CMAKE_C_COMPILER "/usr/bin/gcc") SET(CMAKE_C_COMPILER_ARG1 "") SET(CMAKE_C_COMPILER_ID "GNU") +<<<<<<< HEAD SET(CMAKE_C_COMPILER_VERSION "4.6.3") +======= +SET(CMAKE_C_COMPILER_VERSION "4.7.2") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 SET(CMAKE_C_PLATFORM_ID "Linux") SET(CMAKE_AR "/usr/bin/ar") @@ -29,7 +33,11 @@ SET(CMAKE_C_LINKER_PREFERENCE 10) # Save compiler ABI information. SET(CMAKE_C_SIZEOF_DATA_PTR "4") SET(CMAKE_C_COMPILER_ABI "ELF") +<<<<<<< HEAD SET(CMAKE_C_LIBRARY_ARCHITECTURE "arm-linux-gnueabihf") +======= +SET(CMAKE_C_LIBRARY_ARCHITECTURE "i386-linux-gnu") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 IF(CMAKE_C_SIZEOF_DATA_PTR) SET(CMAKE_SIZEOF_VOID_P "${CMAKE_C_SIZEOF_DATA_PTR}") @@ -40,14 +48,22 @@ IF(CMAKE_C_COMPILER_ABI) ENDIF(CMAKE_C_COMPILER_ABI) IF(CMAKE_C_LIBRARY_ARCHITECTURE) +<<<<<<< HEAD SET(CMAKE_LIBRARY_ARCHITECTURE "arm-linux-gnueabihf") +======= + SET(CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ENDIF() SET(CMAKE_C_HAS_ISYSROOT "") SET(CMAKE_C_IMPLICIT_LINK_LIBRARIES "c") +<<<<<<< HEAD SET(CMAKE_C_IMPLICIT_LINK_DIRECTORIES "/usr/lib/gcc/arm-linux-gnueabihf/4.6;/usr/lib/arm-linux-gnueabihf;/usr/lib;/lib/arm-linux-gnueabihf") +======= +SET(CMAKE_C_IMPLICIT_LINK_DIRECTORIES "/usr/lib/gcc/i486-linux-gnu/4.7;/usr/lib/i386-linux-gnu;/usr/lib;/lib/i386-linux-gnu;/lib") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 diff --git a/build/CMakeFiles/CMakeCXXCompiler.cmake b/build/CMakeFiles/CMakeCXXCompiler.cmake index 898c9f2..b801e22 100644 --- a/build/CMakeFiles/CMakeCXXCompiler.cmake +++ b/build/CMakeFiles/CMakeCXXCompiler.cmake @@ -1,7 +1,11 @@ SET(CMAKE_CXX_COMPILER "/usr/bin/c++") SET(CMAKE_CXX_COMPILER_ARG1 "") SET(CMAKE_CXX_COMPILER_ID "GNU") +<<<<<<< HEAD SET(CMAKE_CXX_COMPILER_VERSION "4.6.3") +======= +SET(CMAKE_CXX_COMPILER_VERSION "4.7.2") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 SET(CMAKE_CXX_PLATFORM_ID "Linux") SET(CMAKE_AR "/usr/bin/ar") @@ -30,7 +34,11 @@ SET(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES 1) # Save compiler ABI information. SET(CMAKE_CXX_SIZEOF_DATA_PTR "4") SET(CMAKE_CXX_COMPILER_ABI "ELF") +<<<<<<< HEAD SET(CMAKE_CXX_LIBRARY_ARCHITECTURE "arm-linux-gnueabihf") +======= +SET(CMAKE_CXX_LIBRARY_ARCHITECTURE "i386-linux-gnu") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 IF(CMAKE_CXX_SIZEOF_DATA_PTR) SET(CMAKE_SIZEOF_VOID_P "${CMAKE_CXX_SIZEOF_DATA_PTR}") @@ -41,14 +49,22 @@ IF(CMAKE_CXX_COMPILER_ABI) ENDIF(CMAKE_CXX_COMPILER_ABI) IF(CMAKE_CXX_LIBRARY_ARCHITECTURE) +<<<<<<< HEAD SET(CMAKE_LIBRARY_ARCHITECTURE "arm-linux-gnueabihf") +======= + SET(CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ENDIF() SET(CMAKE_CXX_HAS_ISYSROOT "") SET(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "stdc++;m;c") +<<<<<<< HEAD SET(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "/usr/lib/gcc/arm-linux-gnueabihf/4.6;/usr/lib/arm-linux-gnueabihf;/usr/lib;/lib/arm-linux-gnueabihf") +======= +SET(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "/usr/lib/gcc/i486-linux-gnu/4.7;/usr/lib/i386-linux-gnu;/usr/lib;/lib/i386-linux-gnu;/lib") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 diff --git a/build/CMakeFiles/CMakeDirectoryInformation.cmake b/build/CMakeFiles/CMakeDirectoryInformation.cmake index cf6f306..422160a 100644 --- a/build/CMakeFiles/CMakeDirectoryInformation.cmake +++ b/build/CMakeFiles/CMakeDirectoryInformation.cmake @@ -2,8 +2,13 @@ # Generated by "Unix Makefiles" Generator, CMake Version 2.8 # Relative path conversion top directories. +<<<<<<< HEAD SET(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/nomad/nomad_ws/src") SET(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/nomad/nomad_ws/build") +======= +SET(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/edison/nomad_ws/src") +SET(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/edison/nomad_ws/build") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # Force unix paths in dependencies. SET(CMAKE_FORCE_UNIX_PATHS 1) diff --git a/build/CMakeFiles/CMakeError.log b/build/CMakeFiles/CMakeError.log index 5a6ed29..06f0dad 100644 --- a/build/CMakeFiles/CMakeError.log +++ b/build/CMakeFiles/CMakeError.log @@ -1,4 +1,5 @@ Determining if the pthread_create exist failed with the following output: +<<<<<<< HEAD Change Dir: /home/nomad/nomad_ws/build/CMakeFiles/CMakeTmp Run Build Command:/usr/bin/make "cmTryCompileExec2023277765/fast" @@ -20,6 +21,27 @@ Makefile:114: recipe for target 'cmTryCompileExec2023277765/fast' failed make: *** [cmTryCompileExec2023277765/fast] Error 2 File /home/nomad/nomad_ws/build/CMakeFiles/CMakeTmp/CheckSymbolExists.c: +======= +Change Dir: /home/edison/nomad_ws/build/CMakeFiles/CMakeTmp + +Run Build Command:/usr/bin/make "cmTryCompileExec2145183695/fast" +/usr/bin/make -f CMakeFiles/cmTryCompileExec2145183695.dir/build.make CMakeFiles/cmTryCompileExec2145183695.dir/build +make[1]: Entering directory `/home/edison/nomad_ws/build/CMakeFiles/CMakeTmp' +/usr/bin/cmake -E cmake_progress_report /home/edison/nomad_ws/build/CMakeFiles/CMakeTmp/CMakeFiles 1 +Building C object CMakeFiles/cmTryCompileExec2145183695.dir/CheckSymbolExists.c.o +/usr/bin/gcc -o CMakeFiles/cmTryCompileExec2145183695.dir/CheckSymbolExists.c.o -c /home/edison/nomad_ws/build/CMakeFiles/CMakeTmp/CheckSymbolExists.c +Linking C executable cmTryCompileExec2145183695 +/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTryCompileExec2145183695.dir/link.txt --verbose=1 +/usr/bin/gcc CMakeFiles/cmTryCompileExec2145183695.dir/CheckSymbolExists.c.o -o cmTryCompileExec2145183695 -rdynamic +CMakeFiles/cmTryCompileExec2145183695.dir/CheckSymbolExists.c.o: In function `main': +CheckSymbolExists.c:(.text+0xa): undefined reference to `pthread_create' +collect2: error: ld returned 1 exit status +make[1]: *** [cmTryCompileExec2145183695] Error 1 +make[1]: Leaving directory `/home/edison/nomad_ws/build/CMakeFiles/CMakeTmp' +make: *** [cmTryCompileExec2145183695/fast] Error 2 + +File /home/edison/nomad_ws/build/CMakeFiles/CMakeTmp/CheckSymbolExists.c: +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 /* */ #include @@ -35,6 +57,7 @@ int main(int argc, char** argv) } Determining if the function pthread_create exists in the pthreads failed with the following output: +<<<<<<< HEAD Change Dir: /home/nomad/nomad_ws/build/CMakeFiles/CMakeTmp Run Build Command:/usr/bin/make "cmTryCompileExec4000534738/fast" @@ -53,5 +76,23 @@ make[1]: Leaving directory '/home/nomad/nomad_ws/build/CMakeFiles/CMakeTmp' make[1]: *** [cmTryCompileExec4000534738] Error 1 Makefile:114: recipe for target 'cmTryCompileExec4000534738/fast' failed make: *** [cmTryCompileExec4000534738/fast] Error 2 +======= +Change Dir: /home/edison/nomad_ws/build/CMakeFiles/CMakeTmp + +Run Build Command:/usr/bin/make "cmTryCompileExec2712259973/fast" +/usr/bin/make -f CMakeFiles/cmTryCompileExec2712259973.dir/build.make CMakeFiles/cmTryCompileExec2712259973.dir/build +make[1]: Entering directory `/home/edison/nomad_ws/build/CMakeFiles/CMakeTmp' +/usr/bin/cmake -E cmake_progress_report /home/edison/nomad_ws/build/CMakeFiles/CMakeTmp/CMakeFiles 1 +Building C object CMakeFiles/cmTryCompileExec2712259973.dir/CheckFunctionExists.c.o +/usr/bin/gcc -DCHECK_FUNCTION_EXISTS=pthread_create -o CMakeFiles/cmTryCompileExec2712259973.dir/CheckFunctionExists.c.o -c /usr/share/cmake-2.8/Modules/CheckFunctionExists.c +Linking C executable cmTryCompileExec2712259973 +/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTryCompileExec2712259973.dir/link.txt --verbose=1 +/usr/bin/gcc -DCHECK_FUNCTION_EXISTS=pthread_create CMakeFiles/cmTryCompileExec2712259973.dir/CheckFunctionExists.c.o -o cmTryCompileExec2712259973 -rdynamic -lpthreads +/usr/bin/ld: cannot find -lpthreads +collect2: error: ld returned 1 exit status +make[1]: *** [cmTryCompileExec2712259973] Error 1 +make[1]: Leaving directory `/home/edison/nomad_ws/build/CMakeFiles/CMakeTmp' +make: *** [cmTryCompileExec2712259973/fast] Error 2 +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 diff --git a/build/CMakeFiles/CMakeOutput.log b/build/CMakeFiles/CMakeOutput.log index 6124a40..aabc839 100644 --- a/build/CMakeFiles/CMakeOutput.log +++ b/build/CMakeFiles/CMakeOutput.log @@ -1,4 +1,8 @@ +<<<<<<< HEAD The system is: Linux - 4.1.7+ - armv6l +======= +The system is: Linux - 3.10.17-yocto-standard-r2 - i686 +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 Compiling the C compiler identification source file "CMakeCCompilerId.c" succeeded. Compiler: /usr/bin/gcc Build flags: @@ -10,7 +14,11 @@ The output was: Compilation of the C compiler identification source "CMakeCCompilerId.c" produced "a.out" +<<<<<<< HEAD The C compiler identification is GNU, found in "/home/nomad/nomad_ws/build/CMakeFiles/CompilerIdC/a.out" +======= +The C compiler identification is GNU, found in "/home/edison/nomad_ws/build/CMakeFiles/CompilerIdC/a.out" +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 Compiling the CXX compiler identification source file "CMakeCXXCompilerId.cpp" succeeded. Compiler: /usr/bin/c++ @@ -23,6 +31,7 @@ The output was: Compilation of the CXX compiler identification source "CMakeCXXCompilerId.cpp" produced "a.out" +<<<<<<< HEAD The CXX compiler identification is GNU, found in "/home/nomad/nomad_ws/build/CMakeFiles/CompilerIdCXX/a.out" Determining if the C compiler works passed with the following output: @@ -64,10 +73,54 @@ LIBRARY_PATH=/usr/lib/gcc/arm-linux-gnueabihf/4.6/:/usr/lib/gcc/arm-linux-gnueab COLLECT_GCC_OPTIONS='-v' '-o' 'cmTryCompileExec2282012611' '-rdynamic' '-march=armv6' '-mfloat-abi=hard' '-mfpu=vfp' /usr/lib/gcc/arm-linux-gnueabihf/4.6/collect2 --sysroot=/ --build-id --no-add-needed --eh-frame-hdr -export-dynamic -dynamic-linker /lib/ld-linux-armhf.so.3 -X --hash-style=both -m armelf_linux_eabi -o cmTryCompileExec2282012611 /usr/lib/gcc/arm-linux-gnueabihf/4.6/../../../arm-linux-gnueabihf/crt1.o /usr/lib/gcc/arm-linux-gnueabihf/4.6/../../../arm-linux-gnueabihf/crti.o /usr/lib/gcc/arm-linux-gnueabihf/4.6/crtbegin.o -L/usr/lib/gcc/arm-linux-gnueabihf/4.6 -L/usr/lib/gcc/arm-linux-gnueabihf/4.6/../../../arm-linux-gnueabihf -L/usr/lib/gcc/arm-linux-gnueabihf/4.6/../../.. -L/lib/arm-linux-gnueabihf -L/usr/lib/arm-linux-gnueabihf CMakeFiles/cmTryCompileExec2282012611.dir/CMakeCCompilerABI.c.o -lgcc --as-needed -lgcc_s --no-as-needed -lc -lgcc --as-needed -lgcc_s --no-as-needed /usr/lib/gcc/arm-linux-gnueabihf/4.6/crtend.o /usr/lib/gcc/arm-linux-gnueabihf/4.6/../../../arm-linux-gnueabihf/crtn.o make[1]: Leaving directory '/home/nomad/nomad_ws/build/CMakeFiles/CMakeTmp' +======= +The CXX compiler identification is GNU, found in "/home/edison/nomad_ws/build/CMakeFiles/CompilerIdCXX/a.out" + +Determining if the C compiler works passed with the following output: +Change Dir: /home/edison/nomad_ws/build/CMakeFiles/CMakeTmp + +Run Build Command:/usr/bin/make "cmTryCompileExec1729453531/fast" +/usr/bin/make -f CMakeFiles/cmTryCompileExec1729453531.dir/build.make CMakeFiles/cmTryCompileExec1729453531.dir/build +make[1]: Entering directory `/home/edison/nomad_ws/build/CMakeFiles/CMakeTmp' +/usr/bin/cmake -E cmake_progress_report /home/edison/nomad_ws/build/CMakeFiles/CMakeTmp/CMakeFiles 1 +Building C object CMakeFiles/cmTryCompileExec1729453531.dir/testCCompiler.c.o +/usr/bin/gcc -o CMakeFiles/cmTryCompileExec1729453531.dir/testCCompiler.c.o -c /home/edison/nomad_ws/build/CMakeFiles/CMakeTmp/testCCompiler.c +Linking C executable cmTryCompileExec1729453531 +/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTryCompileExec1729453531.dir/link.txt --verbose=1 +/usr/bin/gcc CMakeFiles/cmTryCompileExec1729453531.dir/testCCompiler.c.o -o cmTryCompileExec1729453531 -rdynamic +make[1]: Leaving directory `/home/edison/nomad_ws/build/CMakeFiles/CMakeTmp' + + +Detecting C compiler ABI info compiled with the following output: +Change Dir: /home/edison/nomad_ws/build/CMakeFiles/CMakeTmp + +Run Build Command:/usr/bin/make "cmTryCompileExec2180533996/fast" +/usr/bin/make -f CMakeFiles/cmTryCompileExec2180533996.dir/build.make CMakeFiles/cmTryCompileExec2180533996.dir/build +make[1]: Entering directory `/home/edison/nomad_ws/build/CMakeFiles/CMakeTmp' +/usr/bin/cmake -E cmake_progress_report /home/edison/nomad_ws/build/CMakeFiles/CMakeTmp/CMakeFiles 1 +Building C object CMakeFiles/cmTryCompileExec2180533996.dir/CMakeCCompilerABI.c.o +/usr/bin/gcc -o CMakeFiles/cmTryCompileExec2180533996.dir/CMakeCCompilerABI.c.o -c /usr/share/cmake-2.8/Modules/CMakeCCompilerABI.c +Linking C executable cmTryCompileExec2180533996 +/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTryCompileExec2180533996.dir/link.txt --verbose=1 +/usr/bin/gcc -v CMakeFiles/cmTryCompileExec2180533996.dir/CMakeCCompilerABI.c.o -o cmTryCompileExec2180533996 -rdynamic +Using built-in specs. +COLLECT_GCC=/usr/bin/gcc +COLLECT_LTO_WRAPPER=/usr/lib/gcc/i486-linux-gnu/4.7/lto-wrapper +Target: i486-linux-gnu +Configured with: ../src/configure -v --with-pkgversion='Debian 4.7.2-5' --with-bugurl=file:///usr/share/doc/gcc-4.7/README.Bugs --enable-languages=c,c++,go,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-4.7 --enable-shared --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.7 --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --enable-gnu-unique-object --enable-plugin --enable-objc-gc --enable-targets=all --with-arch-32=i586 --with-tune=generic --enable-checking=release --build=i486-linux-gnu --host=i486-linux-gnu --target=i486-linux-gnu +Thread model: posix +gcc version 4.7.2 (Debian 4.7.2-5) +COMPILER_PATH=/usr/lib/gcc/i486-linux-gnu/4.7/:/usr/lib/gcc/i486-linux-gnu/4.7/:/usr/lib/gcc/i486-linux-gnu/:/usr/lib/gcc/i486-linux-gnu/4.7/:/usr/lib/gcc/i486-linux-gnu/ +LIBRARY_PATH=/usr/lib/gcc/i486-linux-gnu/4.7/:/usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu/:/usr/lib/gcc/i486-linux-gnu/4.7/../../../../lib/:/lib/i386-linux-gnu/:/lib/../lib/:/usr/lib/i386-linux-gnu/:/usr/lib/../lib/:/usr/lib/gcc/i486-linux-gnu/4.7/../../../:/lib/:/usr/lib/ +COLLECT_GCC_OPTIONS='-v' '-o' 'cmTryCompileExec2180533996' '-rdynamic' '-mtune=generic' '-march=i586' + /usr/lib/gcc/i486-linux-gnu/4.7/collect2 --sysroot=/ --build-id --no-add-needed --eh-frame-hdr -m elf_i386 --hash-style=both -export-dynamic -dynamic-linker /lib/ld-linux.so.2 -o cmTryCompileExec2180533996 /usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu/crt1.o /usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu/crti.o /usr/lib/gcc/i486-linux-gnu/4.7/crtbegin.o -L/usr/lib/gcc/i486-linux-gnu/4.7 -L/usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu -L/usr/lib/gcc/i486-linux-gnu/4.7/../../../../lib -L/lib/i386-linux-gnu -L/lib/../lib -L/usr/lib/i386-linux-gnu -L/usr/lib/../lib -L/usr/lib/gcc/i486-linux-gnu/4.7/../../.. CMakeFiles/cmTryCompileExec2180533996.dir/CMakeCCompilerABI.c.o -lgcc --as-needed -lgcc_s --no-as-needed -lc -lgcc --as-needed -lgcc_s --no-as-needed /usr/lib/gcc/i486-linux-gnu/4.7/crtend.o /usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu/crtn.o +make[1]: Leaving directory `/home/edison/nomad_ws/build/CMakeFiles/CMakeTmp' +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 Parsed C implicit link information from above output: link line regex: [^( *|.*[/\])(ld|ld|collect2)[^/\]*( |$)] +<<<<<<< HEAD ignore line: [Change Dir: /home/nomad/nomad_ws/build/CMakeFiles/CMakeTmp] ignore line: [] ignore line: [Run Build Command:/usr/bin/make "cmTryCompileExec2282012611/fast"] @@ -91,10 +144,36 @@ Parsed C implicit link information from above output: ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'cmTryCompileExec2282012611' '-rdynamic' '-march=armv6' '-mfloat-abi=hard' '-mfpu=vfp'] link line: [ /usr/lib/gcc/arm-linux-gnueabihf/4.6/collect2 --sysroot=/ --build-id --no-add-needed --eh-frame-hdr -export-dynamic -dynamic-linker /lib/ld-linux-armhf.so.3 -X --hash-style=both -m armelf_linux_eabi -o cmTryCompileExec2282012611 /usr/lib/gcc/arm-linux-gnueabihf/4.6/../../../arm-linux-gnueabihf/crt1.o /usr/lib/gcc/arm-linux-gnueabihf/4.6/../../../arm-linux-gnueabihf/crti.o /usr/lib/gcc/arm-linux-gnueabihf/4.6/crtbegin.o -L/usr/lib/gcc/arm-linux-gnueabihf/4.6 -L/usr/lib/gcc/arm-linux-gnueabihf/4.6/../../../arm-linux-gnueabihf -L/usr/lib/gcc/arm-linux-gnueabihf/4.6/../../.. -L/lib/arm-linux-gnueabihf -L/usr/lib/arm-linux-gnueabihf CMakeFiles/cmTryCompileExec2282012611.dir/CMakeCCompilerABI.c.o -lgcc --as-needed -lgcc_s --no-as-needed -lc -lgcc --as-needed -lgcc_s --no-as-needed /usr/lib/gcc/arm-linux-gnueabihf/4.6/crtend.o /usr/lib/gcc/arm-linux-gnueabihf/4.6/../../../arm-linux-gnueabihf/crtn.o] arg [/usr/lib/gcc/arm-linux-gnueabihf/4.6/collect2] ==> ignore +======= + ignore line: [Change Dir: /home/edison/nomad_ws/build/CMakeFiles/CMakeTmp] + ignore line: [] + ignore line: [Run Build Command:/usr/bin/make "cmTryCompileExec2180533996/fast"] + ignore line: [/usr/bin/make -f CMakeFiles/cmTryCompileExec2180533996.dir/build.make CMakeFiles/cmTryCompileExec2180533996.dir/build] + ignore line: [make[1]: Entering directory `/home/edison/nomad_ws/build/CMakeFiles/CMakeTmp'] + ignore line: [/usr/bin/cmake -E cmake_progress_report /home/edison/nomad_ws/build/CMakeFiles/CMakeTmp/CMakeFiles 1] + ignore line: [Building C object CMakeFiles/cmTryCompileExec2180533996.dir/CMakeCCompilerABI.c.o] + ignore line: [/usr/bin/gcc -o CMakeFiles/cmTryCompileExec2180533996.dir/CMakeCCompilerABI.c.o -c /usr/share/cmake-2.8/Modules/CMakeCCompilerABI.c] + ignore line: [Linking C executable cmTryCompileExec2180533996] + ignore line: [/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTryCompileExec2180533996.dir/link.txt --verbose=1] + ignore line: [/usr/bin/gcc -v CMakeFiles/cmTryCompileExec2180533996.dir/CMakeCCompilerABI.c.o -o cmTryCompileExec2180533996 -rdynamic ] + ignore line: [Using built-in specs.] + ignore line: [COLLECT_GCC=/usr/bin/gcc] + ignore line: [COLLECT_LTO_WRAPPER=/usr/lib/gcc/i486-linux-gnu/4.7/lto-wrapper] + ignore line: [Target: i486-linux-gnu] + ignore line: [Configured with: ../src/configure -v --with-pkgversion='Debian 4.7.2-5' --with-bugurl=file:///usr/share/doc/gcc-4.7/README.Bugs --enable-languages=c,c++,go,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-4.7 --enable-shared --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.7 --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --enable-gnu-unique-object --enable-plugin --enable-objc-gc --enable-targets=all --with-arch-32=i586 --with-tune=generic --enable-checking=release --build=i486-linux-gnu --host=i486-linux-gnu --target=i486-linux-gnu] + ignore line: [Thread model: posix] + ignore line: [gcc version 4.7.2 (Debian 4.7.2-5) ] + ignore line: [COMPILER_PATH=/usr/lib/gcc/i486-linux-gnu/4.7/:/usr/lib/gcc/i486-linux-gnu/4.7/:/usr/lib/gcc/i486-linux-gnu/:/usr/lib/gcc/i486-linux-gnu/4.7/:/usr/lib/gcc/i486-linux-gnu/] + ignore line: [LIBRARY_PATH=/usr/lib/gcc/i486-linux-gnu/4.7/:/usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu/:/usr/lib/gcc/i486-linux-gnu/4.7/../../../../lib/:/lib/i386-linux-gnu/:/lib/../lib/:/usr/lib/i386-linux-gnu/:/usr/lib/../lib/:/usr/lib/gcc/i486-linux-gnu/4.7/../../../:/lib/:/usr/lib/] + ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'cmTryCompileExec2180533996' '-rdynamic' '-mtune=generic' '-march=i586'] + link line: [ /usr/lib/gcc/i486-linux-gnu/4.7/collect2 --sysroot=/ --build-id --no-add-needed --eh-frame-hdr -m elf_i386 --hash-style=both -export-dynamic -dynamic-linker /lib/ld-linux.so.2 -o cmTryCompileExec2180533996 /usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu/crt1.o /usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu/crti.o /usr/lib/gcc/i486-linux-gnu/4.7/crtbegin.o -L/usr/lib/gcc/i486-linux-gnu/4.7 -L/usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu -L/usr/lib/gcc/i486-linux-gnu/4.7/../../../../lib -L/lib/i386-linux-gnu -L/lib/../lib -L/usr/lib/i386-linux-gnu -L/usr/lib/../lib -L/usr/lib/gcc/i486-linux-gnu/4.7/../../.. CMakeFiles/cmTryCompileExec2180533996.dir/CMakeCCompilerABI.c.o -lgcc --as-needed -lgcc_s --no-as-needed -lc -lgcc --as-needed -lgcc_s --no-as-needed /usr/lib/gcc/i486-linux-gnu/4.7/crtend.o /usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu/crtn.o] + arg [/usr/lib/gcc/i486-linux-gnu/4.7/collect2] ==> ignore +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 arg [--sysroot=/] ==> ignore arg [--build-id] ==> ignore arg [--no-add-needed] ==> ignore arg [--eh-frame-hdr] ==> ignore +<<<<<<< HEAD arg [-export-dynamic] ==> ignore arg [-dynamic-linker] ==> ignore arg [/lib/ld-linux-armhf.so.3] ==> ignore @@ -113,6 +192,28 @@ Parsed C implicit link information from above output: arg [-L/lib/arm-linux-gnueabihf] ==> dir [/lib/arm-linux-gnueabihf] arg [-L/usr/lib/arm-linux-gnueabihf] ==> dir [/usr/lib/arm-linux-gnueabihf] arg [CMakeFiles/cmTryCompileExec2282012611.dir/CMakeCCompilerABI.c.o] ==> ignore +======= + arg [-m] ==> ignore + arg [elf_i386] ==> ignore + arg [--hash-style=both] ==> ignore + arg [-export-dynamic] ==> ignore + arg [-dynamic-linker] ==> ignore + arg [/lib/ld-linux.so.2] ==> ignore + arg [-o] ==> ignore + arg [cmTryCompileExec2180533996] ==> ignore + arg [/usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu/crt1.o] ==> ignore + arg [/usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu/crti.o] ==> ignore + arg [/usr/lib/gcc/i486-linux-gnu/4.7/crtbegin.o] ==> ignore + arg [-L/usr/lib/gcc/i486-linux-gnu/4.7] ==> dir [/usr/lib/gcc/i486-linux-gnu/4.7] + arg [-L/usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu] ==> dir [/usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu] + arg [-L/usr/lib/gcc/i486-linux-gnu/4.7/../../../../lib] ==> dir [/usr/lib/gcc/i486-linux-gnu/4.7/../../../../lib] + arg [-L/lib/i386-linux-gnu] ==> dir [/lib/i386-linux-gnu] + arg [-L/lib/../lib] ==> dir [/lib/../lib] + arg [-L/usr/lib/i386-linux-gnu] ==> dir [/usr/lib/i386-linux-gnu] + arg [-L/usr/lib/../lib] ==> dir [/usr/lib/../lib] + arg [-L/usr/lib/gcc/i486-linux-gnu/4.7/../../..] ==> dir [/usr/lib/gcc/i486-linux-gnu/4.7/../../..] + arg [CMakeFiles/cmTryCompileExec2180533996.dir/CMakeCCompilerABI.c.o] ==> ignore +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 arg [-lgcc] ==> lib [gcc] arg [--as-needed] ==> ignore arg [-lgcc_s] ==> lib [gcc_s] @@ -122,12 +223,18 @@ Parsed C implicit link information from above output: arg [--as-needed] ==> ignore arg [-lgcc_s] ==> lib [gcc_s] arg [--no-as-needed] ==> ignore +<<<<<<< HEAD arg [/usr/lib/gcc/arm-linux-gnueabihf/4.6/crtend.o] ==> ignore arg [/usr/lib/gcc/arm-linux-gnueabihf/4.6/../../../arm-linux-gnueabihf/crtn.o] ==> ignore +======= + arg [/usr/lib/gcc/i486-linux-gnu/4.7/crtend.o] ==> ignore + arg [/usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu/crtn.o] ==> ignore +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 remove lib [gcc] remove lib [gcc_s] remove lib [gcc] remove lib [gcc_s] +<<<<<<< HEAD collapse dir [/usr/lib/gcc/arm-linux-gnueabihf/4.6] ==> [/usr/lib/gcc/arm-linux-gnueabihf/4.6] collapse dir [/usr/lib/gcc/arm-linux-gnueabihf/4.6/../../../arm-linux-gnueabihf] ==> [/usr/lib/arm-linux-gnueabihf] collapse dir [/usr/lib/gcc/arm-linux-gnueabihf/4.6/../../..] ==> [/usr/lib] @@ -176,10 +283,64 @@ LIBRARY_PATH=/usr/lib/gcc/arm-linux-gnueabihf/4.6/:/usr/lib/gcc/arm-linux-gnueab COLLECT_GCC_OPTIONS='-v' '-o' 'cmTryCompileExec427374629' '-rdynamic' '-shared-libgcc' '-march=armv6' '-mfloat-abi=hard' '-mfpu=vfp' /usr/lib/gcc/arm-linux-gnueabihf/4.6/collect2 --sysroot=/ --build-id --no-add-needed --eh-frame-hdr -export-dynamic -dynamic-linker /lib/ld-linux-armhf.so.3 -X --hash-style=both -m armelf_linux_eabi -o cmTryCompileExec427374629 /usr/lib/gcc/arm-linux-gnueabihf/4.6/../../../arm-linux-gnueabihf/crt1.o /usr/lib/gcc/arm-linux-gnueabihf/4.6/../../../arm-linux-gnueabihf/crti.o /usr/lib/gcc/arm-linux-gnueabihf/4.6/crtbegin.o -L/usr/lib/gcc/arm-linux-gnueabihf/4.6 -L/usr/lib/gcc/arm-linux-gnueabihf/4.6/../../../arm-linux-gnueabihf -L/usr/lib/gcc/arm-linux-gnueabihf/4.6/../../.. -L/lib/arm-linux-gnueabihf -L/usr/lib/arm-linux-gnueabihf CMakeFiles/cmTryCompileExec427374629.dir/CMakeCXXCompilerABI.cpp.o -lstdc++ -lm -lgcc_s -lgcc -lc -lgcc_s -lgcc /usr/lib/gcc/arm-linux-gnueabihf/4.6/crtend.o /usr/lib/gcc/arm-linux-gnueabihf/4.6/../../../arm-linux-gnueabihf/crtn.o make[1]: Leaving directory '/home/nomad/nomad_ws/build/CMakeFiles/CMakeTmp' +======= + collapse dir [/usr/lib/gcc/i486-linux-gnu/4.7] ==> [/usr/lib/gcc/i486-linux-gnu/4.7] + collapse dir [/usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu] ==> [/usr/lib/i386-linux-gnu] + collapse dir [/usr/lib/gcc/i486-linux-gnu/4.7/../../../../lib] ==> [/usr/lib] + collapse dir [/lib/i386-linux-gnu] ==> [/lib/i386-linux-gnu] + collapse dir [/lib/../lib] ==> [/lib] + collapse dir [/usr/lib/i386-linux-gnu] ==> [/usr/lib/i386-linux-gnu] + collapse dir [/usr/lib/../lib] ==> [/usr/lib] + collapse dir [/usr/lib/gcc/i486-linux-gnu/4.7/../../..] ==> [/usr/lib] + implicit libs: [c] + implicit dirs: [/usr/lib/gcc/i486-linux-gnu/4.7;/usr/lib/i386-linux-gnu;/usr/lib;/lib/i386-linux-gnu;/lib] + + +Determining if the CXX compiler works passed with the following output: +Change Dir: /home/edison/nomad_ws/build/CMakeFiles/CMakeTmp + +Run Build Command:/usr/bin/make "cmTryCompileExec2002769242/fast" +/usr/bin/make -f CMakeFiles/cmTryCompileExec2002769242.dir/build.make CMakeFiles/cmTryCompileExec2002769242.dir/build +make[1]: Entering directory `/home/edison/nomad_ws/build/CMakeFiles/CMakeTmp' +/usr/bin/cmake -E cmake_progress_report /home/edison/nomad_ws/build/CMakeFiles/CMakeTmp/CMakeFiles 1 +Building CXX object CMakeFiles/cmTryCompileExec2002769242.dir/testCXXCompiler.cxx.o +/usr/bin/c++ -o CMakeFiles/cmTryCompileExec2002769242.dir/testCXXCompiler.cxx.o -c /home/edison/nomad_ws/build/CMakeFiles/CMakeTmp/testCXXCompiler.cxx +Linking CXX executable cmTryCompileExec2002769242 +/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTryCompileExec2002769242.dir/link.txt --verbose=1 +/usr/bin/c++ CMakeFiles/cmTryCompileExec2002769242.dir/testCXXCompiler.cxx.o -o cmTryCompileExec2002769242 -rdynamic +make[1]: Leaving directory `/home/edison/nomad_ws/build/CMakeFiles/CMakeTmp' + + +Detecting CXX compiler ABI info compiled with the following output: +Change Dir: /home/edison/nomad_ws/build/CMakeFiles/CMakeTmp + +Run Build Command:/usr/bin/make "cmTryCompileExec1561370440/fast" +/usr/bin/make -f CMakeFiles/cmTryCompileExec1561370440.dir/build.make CMakeFiles/cmTryCompileExec1561370440.dir/build +make[1]: Entering directory `/home/edison/nomad_ws/build/CMakeFiles/CMakeTmp' +/usr/bin/cmake -E cmake_progress_report /home/edison/nomad_ws/build/CMakeFiles/CMakeTmp/CMakeFiles 1 +Building CXX object CMakeFiles/cmTryCompileExec1561370440.dir/CMakeCXXCompilerABI.cpp.o +/usr/bin/c++ -o CMakeFiles/cmTryCompileExec1561370440.dir/CMakeCXXCompilerABI.cpp.o -c /usr/share/cmake-2.8/Modules/CMakeCXXCompilerABI.cpp +Linking CXX executable cmTryCompileExec1561370440 +/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTryCompileExec1561370440.dir/link.txt --verbose=1 +/usr/bin/c++ -v CMakeFiles/cmTryCompileExec1561370440.dir/CMakeCXXCompilerABI.cpp.o -o cmTryCompileExec1561370440 -rdynamic +Using built-in specs. +COLLECT_GCC=/usr/bin/c++ +COLLECT_LTO_WRAPPER=/usr/lib/gcc/i486-linux-gnu/4.7/lto-wrapper +Target: i486-linux-gnu +Configured with: ../src/configure -v --with-pkgversion='Debian 4.7.2-5' --with-bugurl=file:///usr/share/doc/gcc-4.7/README.Bugs --enable-languages=c,c++,go,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-4.7 --enable-shared --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.7 --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --enable-gnu-unique-object --enable-plugin --enable-objc-gc --enable-targets=all --with-arch-32=i586 --with-tune=generic --enable-checking=release --build=i486-linux-gnu --host=i486-linux-gnu --target=i486-linux-gnu +Thread model: posix +gcc version 4.7.2 (Debian 4.7.2-5) +COMPILER_PATH=/usr/lib/gcc/i486-linux-gnu/4.7/:/usr/lib/gcc/i486-linux-gnu/4.7/:/usr/lib/gcc/i486-linux-gnu/:/usr/lib/gcc/i486-linux-gnu/4.7/:/usr/lib/gcc/i486-linux-gnu/ +LIBRARY_PATH=/usr/lib/gcc/i486-linux-gnu/4.7/:/usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu/:/usr/lib/gcc/i486-linux-gnu/4.7/../../../../lib/:/lib/i386-linux-gnu/:/lib/../lib/:/usr/lib/i386-linux-gnu/:/usr/lib/../lib/:/usr/lib/gcc/i486-linux-gnu/4.7/../../../:/lib/:/usr/lib/ +COLLECT_GCC_OPTIONS='-v' '-o' 'cmTryCompileExec1561370440' '-rdynamic' '-shared-libgcc' '-mtune=generic' '-march=i586' + /usr/lib/gcc/i486-linux-gnu/4.7/collect2 --sysroot=/ --build-id --no-add-needed --eh-frame-hdr -m elf_i386 --hash-style=both -export-dynamic -dynamic-linker /lib/ld-linux.so.2 -o cmTryCompileExec1561370440 /usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu/crt1.o /usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu/crti.o /usr/lib/gcc/i486-linux-gnu/4.7/crtbegin.o -L/usr/lib/gcc/i486-linux-gnu/4.7 -L/usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu -L/usr/lib/gcc/i486-linux-gnu/4.7/../../../../lib -L/lib/i386-linux-gnu -L/lib/../lib -L/usr/lib/i386-linux-gnu -L/usr/lib/../lib -L/usr/lib/gcc/i486-linux-gnu/4.7/../../.. CMakeFiles/cmTryCompileExec1561370440.dir/CMakeCXXCompilerABI.cpp.o -lstdc++ -lm -lgcc_s -lgcc -lc -lgcc_s -lgcc /usr/lib/gcc/i486-linux-gnu/4.7/crtend.o /usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu/crtn.o +make[1]: Leaving directory `/home/edison/nomad_ws/build/CMakeFiles/CMakeTmp' +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 Parsed CXX implicit link information from above output: link line regex: [^( *|.*[/\])(ld|ld|collect2)[^/\]*( |$)] +<<<<<<< HEAD ignore line: [Change Dir: /home/nomad/nomad_ws/build/CMakeFiles/CMakeTmp] ignore line: [] ignore line: [Run Build Command:/usr/bin/make "cmTryCompileExec427374629/fast"] @@ -203,10 +364,36 @@ Parsed CXX implicit link information from above output: ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'cmTryCompileExec427374629' '-rdynamic' '-shared-libgcc' '-march=armv6' '-mfloat-abi=hard' '-mfpu=vfp'] link line: [ /usr/lib/gcc/arm-linux-gnueabihf/4.6/collect2 --sysroot=/ --build-id --no-add-needed --eh-frame-hdr -export-dynamic -dynamic-linker /lib/ld-linux-armhf.so.3 -X --hash-style=both -m armelf_linux_eabi -o cmTryCompileExec427374629 /usr/lib/gcc/arm-linux-gnueabihf/4.6/../../../arm-linux-gnueabihf/crt1.o /usr/lib/gcc/arm-linux-gnueabihf/4.6/../../../arm-linux-gnueabihf/crti.o /usr/lib/gcc/arm-linux-gnueabihf/4.6/crtbegin.o -L/usr/lib/gcc/arm-linux-gnueabihf/4.6 -L/usr/lib/gcc/arm-linux-gnueabihf/4.6/../../../arm-linux-gnueabihf -L/usr/lib/gcc/arm-linux-gnueabihf/4.6/../../.. -L/lib/arm-linux-gnueabihf -L/usr/lib/arm-linux-gnueabihf CMakeFiles/cmTryCompileExec427374629.dir/CMakeCXXCompilerABI.cpp.o -lstdc++ -lm -lgcc_s -lgcc -lc -lgcc_s -lgcc /usr/lib/gcc/arm-linux-gnueabihf/4.6/crtend.o /usr/lib/gcc/arm-linux-gnueabihf/4.6/../../../arm-linux-gnueabihf/crtn.o] arg [/usr/lib/gcc/arm-linux-gnueabihf/4.6/collect2] ==> ignore +======= + ignore line: [Change Dir: /home/edison/nomad_ws/build/CMakeFiles/CMakeTmp] + ignore line: [] + ignore line: [Run Build Command:/usr/bin/make "cmTryCompileExec1561370440/fast"] + ignore line: [/usr/bin/make -f CMakeFiles/cmTryCompileExec1561370440.dir/build.make CMakeFiles/cmTryCompileExec1561370440.dir/build] + ignore line: [make[1]: Entering directory `/home/edison/nomad_ws/build/CMakeFiles/CMakeTmp'] + ignore line: [/usr/bin/cmake -E cmake_progress_report /home/edison/nomad_ws/build/CMakeFiles/CMakeTmp/CMakeFiles 1] + ignore line: [Building CXX object CMakeFiles/cmTryCompileExec1561370440.dir/CMakeCXXCompilerABI.cpp.o] + ignore line: [/usr/bin/c++ -o CMakeFiles/cmTryCompileExec1561370440.dir/CMakeCXXCompilerABI.cpp.o -c /usr/share/cmake-2.8/Modules/CMakeCXXCompilerABI.cpp] + ignore line: [Linking CXX executable cmTryCompileExec1561370440] + ignore line: [/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTryCompileExec1561370440.dir/link.txt --verbose=1] + ignore line: [/usr/bin/c++ -v CMakeFiles/cmTryCompileExec1561370440.dir/CMakeCXXCompilerABI.cpp.o -o cmTryCompileExec1561370440 -rdynamic ] + ignore line: [Using built-in specs.] + ignore line: [COLLECT_GCC=/usr/bin/c++] + ignore line: [COLLECT_LTO_WRAPPER=/usr/lib/gcc/i486-linux-gnu/4.7/lto-wrapper] + ignore line: [Target: i486-linux-gnu] + ignore line: [Configured with: ../src/configure -v --with-pkgversion='Debian 4.7.2-5' --with-bugurl=file:///usr/share/doc/gcc-4.7/README.Bugs --enable-languages=c,c++,go,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-4.7 --enable-shared --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.7 --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --enable-gnu-unique-object --enable-plugin --enable-objc-gc --enable-targets=all --with-arch-32=i586 --with-tune=generic --enable-checking=release --build=i486-linux-gnu --host=i486-linux-gnu --target=i486-linux-gnu] + ignore line: [Thread model: posix] + ignore line: [gcc version 4.7.2 (Debian 4.7.2-5) ] + ignore line: [COMPILER_PATH=/usr/lib/gcc/i486-linux-gnu/4.7/:/usr/lib/gcc/i486-linux-gnu/4.7/:/usr/lib/gcc/i486-linux-gnu/:/usr/lib/gcc/i486-linux-gnu/4.7/:/usr/lib/gcc/i486-linux-gnu/] + ignore line: [LIBRARY_PATH=/usr/lib/gcc/i486-linux-gnu/4.7/:/usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu/:/usr/lib/gcc/i486-linux-gnu/4.7/../../../../lib/:/lib/i386-linux-gnu/:/lib/../lib/:/usr/lib/i386-linux-gnu/:/usr/lib/../lib/:/usr/lib/gcc/i486-linux-gnu/4.7/../../../:/lib/:/usr/lib/] + ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'cmTryCompileExec1561370440' '-rdynamic' '-shared-libgcc' '-mtune=generic' '-march=i586'] + link line: [ /usr/lib/gcc/i486-linux-gnu/4.7/collect2 --sysroot=/ --build-id --no-add-needed --eh-frame-hdr -m elf_i386 --hash-style=both -export-dynamic -dynamic-linker /lib/ld-linux.so.2 -o cmTryCompileExec1561370440 /usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu/crt1.o /usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu/crti.o /usr/lib/gcc/i486-linux-gnu/4.7/crtbegin.o -L/usr/lib/gcc/i486-linux-gnu/4.7 -L/usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu -L/usr/lib/gcc/i486-linux-gnu/4.7/../../../../lib -L/lib/i386-linux-gnu -L/lib/../lib -L/usr/lib/i386-linux-gnu -L/usr/lib/../lib -L/usr/lib/gcc/i486-linux-gnu/4.7/../../.. CMakeFiles/cmTryCompileExec1561370440.dir/CMakeCXXCompilerABI.cpp.o -lstdc++ -lm -lgcc_s -lgcc -lc -lgcc_s -lgcc /usr/lib/gcc/i486-linux-gnu/4.7/crtend.o /usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu/crtn.o] + arg [/usr/lib/gcc/i486-linux-gnu/4.7/collect2] ==> ignore +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 arg [--sysroot=/] ==> ignore arg [--build-id] ==> ignore arg [--no-add-needed] ==> ignore arg [--eh-frame-hdr] ==> ignore +<<<<<<< HEAD arg [-export-dynamic] ==> ignore arg [-dynamic-linker] ==> ignore arg [/lib/ld-linux-armhf.so.3] ==> ignore @@ -225,6 +412,28 @@ Parsed CXX implicit link information from above output: arg [-L/lib/arm-linux-gnueabihf] ==> dir [/lib/arm-linux-gnueabihf] arg [-L/usr/lib/arm-linux-gnueabihf] ==> dir [/usr/lib/arm-linux-gnueabihf] arg [CMakeFiles/cmTryCompileExec427374629.dir/CMakeCXXCompilerABI.cpp.o] ==> ignore +======= + arg [-m] ==> ignore + arg [elf_i386] ==> ignore + arg [--hash-style=both] ==> ignore + arg [-export-dynamic] ==> ignore + arg [-dynamic-linker] ==> ignore + arg [/lib/ld-linux.so.2] ==> ignore + arg [-o] ==> ignore + arg [cmTryCompileExec1561370440] ==> ignore + arg [/usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu/crt1.o] ==> ignore + arg [/usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu/crti.o] ==> ignore + arg [/usr/lib/gcc/i486-linux-gnu/4.7/crtbegin.o] ==> ignore + arg [-L/usr/lib/gcc/i486-linux-gnu/4.7] ==> dir [/usr/lib/gcc/i486-linux-gnu/4.7] + arg [-L/usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu] ==> dir [/usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu] + arg [-L/usr/lib/gcc/i486-linux-gnu/4.7/../../../../lib] ==> dir [/usr/lib/gcc/i486-linux-gnu/4.7/../../../../lib] + arg [-L/lib/i386-linux-gnu] ==> dir [/lib/i386-linux-gnu] + arg [-L/lib/../lib] ==> dir [/lib/../lib] + arg [-L/usr/lib/i386-linux-gnu] ==> dir [/usr/lib/i386-linux-gnu] + arg [-L/usr/lib/../lib] ==> dir [/usr/lib/../lib] + arg [-L/usr/lib/gcc/i486-linux-gnu/4.7/../../..] ==> dir [/usr/lib/gcc/i486-linux-gnu/4.7/../../..] + arg [CMakeFiles/cmTryCompileExec1561370440.dir/CMakeCXXCompilerABI.cpp.o] ==> ignore +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 arg [-lstdc++] ==> lib [stdc++] arg [-lm] ==> lib [m] arg [-lgcc_s] ==> lib [gcc_s] @@ -232,12 +441,18 @@ Parsed CXX implicit link information from above output: arg [-lc] ==> lib [c] arg [-lgcc_s] ==> lib [gcc_s] arg [-lgcc] ==> lib [gcc] +<<<<<<< HEAD arg [/usr/lib/gcc/arm-linux-gnueabihf/4.6/crtend.o] ==> ignore arg [/usr/lib/gcc/arm-linux-gnueabihf/4.6/../../../arm-linux-gnueabihf/crtn.o] ==> ignore +======= + arg [/usr/lib/gcc/i486-linux-gnu/4.7/crtend.o] ==> ignore + arg [/usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu/crtn.o] ==> ignore +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 remove lib [gcc_s] remove lib [gcc] remove lib [gcc_s] remove lib [gcc] +<<<<<<< HEAD collapse dir [/usr/lib/gcc/arm-linux-gnueabihf/4.6] ==> [/usr/lib/gcc/arm-linux-gnueabihf/4.6] collapse dir [/usr/lib/gcc/arm-linux-gnueabihf/4.6/../../../arm-linux-gnueabihf] ==> [/usr/lib/arm-linux-gnueabihf] collapse dir [/usr/lib/gcc/arm-linux-gnueabihf/4.6/../../..] ==> [/usr/lib] @@ -275,5 +490,47 @@ Linking C executable cmTryCompileExec1521369737 /usr/bin/cmake -E cmake_link_script CMakeFiles/cmTryCompileExec1521369737.dir/link.txt --verbose=1 /usr/bin/gcc -DCHECK_FUNCTION_EXISTS=pthread_create CMakeFiles/cmTryCompileExec1521369737.dir/CheckFunctionExists.c.o -o cmTryCompileExec1521369737 -rdynamic -lpthread make[1]: Leaving directory '/home/nomad/nomad_ws/build/CMakeFiles/CMakeTmp' +======= + collapse dir [/usr/lib/gcc/i486-linux-gnu/4.7] ==> [/usr/lib/gcc/i486-linux-gnu/4.7] + collapse dir [/usr/lib/gcc/i486-linux-gnu/4.7/../../../i386-linux-gnu] ==> [/usr/lib/i386-linux-gnu] + collapse dir [/usr/lib/gcc/i486-linux-gnu/4.7/../../../../lib] ==> [/usr/lib] + collapse dir [/lib/i386-linux-gnu] ==> [/lib/i386-linux-gnu] + collapse dir [/lib/../lib] ==> [/lib] + collapse dir [/usr/lib/i386-linux-gnu] ==> [/usr/lib/i386-linux-gnu] + collapse dir [/usr/lib/../lib] ==> [/usr/lib] + collapse dir [/usr/lib/gcc/i486-linux-gnu/4.7/../../..] ==> [/usr/lib] + implicit libs: [stdc++;m;c] + implicit dirs: [/usr/lib/gcc/i486-linux-gnu/4.7;/usr/lib/i386-linux-gnu;/usr/lib;/lib/i386-linux-gnu;/lib] + + +Determining if files pthread.h exist passed with the following output: +Change Dir: /home/edison/nomad_ws/build/CMakeFiles/CMakeTmp + +Run Build Command:/usr/bin/make "cmTryCompileExec3459574052/fast" +/usr/bin/make -f CMakeFiles/cmTryCompileExec3459574052.dir/build.make CMakeFiles/cmTryCompileExec3459574052.dir/build +make[1]: Entering directory `/home/edison/nomad_ws/build/CMakeFiles/CMakeTmp' +/usr/bin/cmake -E cmake_progress_report /home/edison/nomad_ws/build/CMakeFiles/CMakeTmp/CMakeFiles 1 +Building C object CMakeFiles/cmTryCompileExec3459574052.dir/CheckIncludeFiles.c.o +/usr/bin/gcc -o CMakeFiles/cmTryCompileExec3459574052.dir/CheckIncludeFiles.c.o -c /home/edison/nomad_ws/build/CMakeFiles/CMakeTmp/CheckIncludeFiles.c +Linking C executable cmTryCompileExec3459574052 +/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTryCompileExec3459574052.dir/link.txt --verbose=1 +/usr/bin/gcc CMakeFiles/cmTryCompileExec3459574052.dir/CheckIncludeFiles.c.o -o cmTryCompileExec3459574052 -rdynamic +make[1]: Leaving directory `/home/edison/nomad_ws/build/CMakeFiles/CMakeTmp' + + +Determining if the function pthread_create exists in the pthread passed with the following output: +Change Dir: /home/edison/nomad_ws/build/CMakeFiles/CMakeTmp + +Run Build Command:/usr/bin/make "cmTryCompileExec1628731525/fast" +/usr/bin/make -f CMakeFiles/cmTryCompileExec1628731525.dir/build.make CMakeFiles/cmTryCompileExec1628731525.dir/build +make[1]: Entering directory `/home/edison/nomad_ws/build/CMakeFiles/CMakeTmp' +/usr/bin/cmake -E cmake_progress_report /home/edison/nomad_ws/build/CMakeFiles/CMakeTmp/CMakeFiles 1 +Building C object CMakeFiles/cmTryCompileExec1628731525.dir/CheckFunctionExists.c.o +/usr/bin/gcc -DCHECK_FUNCTION_EXISTS=pthread_create -o CMakeFiles/cmTryCompileExec1628731525.dir/CheckFunctionExists.c.o -c /usr/share/cmake-2.8/Modules/CheckFunctionExists.c +Linking C executable cmTryCompileExec1628731525 +/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTryCompileExec1628731525.dir/link.txt --verbose=1 +/usr/bin/gcc -DCHECK_FUNCTION_EXISTS=pthread_create CMakeFiles/cmTryCompileExec1628731525.dir/CheckFunctionExists.c.o -o cmTryCompileExec1628731525 -rdynamic -lpthread +make[1]: Leaving directory `/home/edison/nomad_ws/build/CMakeFiles/CMakeTmp' +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 diff --git a/build/CMakeFiles/CMakeRuleHashes.txt b/build/CMakeFiles/CMakeRuleHashes.txt index 747348b..97288d6 100644 --- a/build/CMakeFiles/CMakeRuleHashes.txt +++ b/build/CMakeFiles/CMakeRuleHashes.txt @@ -1,4 +1,5 @@ # Hashes of file build rules. +<<<<<<< HEAD 80cbc4dc91589389fb701eb499a40d64 CMakeFiles/clean_test_results 0dc43e88b07ea9af7ee3a090faafc15f CMakeFiles/clean_test_results_Project e38b9b1d32ce827616f6b4b00b3396df CMakeFiles/download_extra_data @@ -14,3 +15,15 @@ db27610dd7444d7ea82328ccd2891e1e nomad/CMakeFiles/rosgraph_msgs_generate_message db27610dd7444d7ea82328ccd2891e1e nomad/CMakeFiles/std_msgs_generate_messages_cpp db27610dd7444d7ea82328ccd2891e1e nomad/CMakeFiles/std_msgs_generate_messages_lisp db27610dd7444d7ea82328ccd2891e1e nomad/CMakeFiles/std_msgs_generate_messages_py +======= +87210101bece16e0834775983baa6d2a CMakeFiles/clean_test_results +cc7e84fc550789c73f94f1e028b52262 CMakeFiles/clean_test_results_Project +0b1e5aba3194740186be500baac701f1 CMakeFiles/download_extra_data +0b1e5aba3194740186be500baac701f1 CMakeFiles/doxygen +0b1e5aba3194740186be500baac701f1 CMakeFiles/run_tests +0b1e5aba3194740186be500baac701f1 CMakeFiles/tests +eb4671d6e90b5b2ecd00ab8145e7e00c nomad/CMakeFiles/std_msgs_generate_messages_cpp +eb4671d6e90b5b2ecd00ab8145e7e00c nomad/CMakeFiles/std_msgs_generate_messages_eus +eb4671d6e90b5b2ecd00ab8145e7e00c nomad/CMakeFiles/std_msgs_generate_messages_lisp +eb4671d6e90b5b2ecd00ab8145e7e00c nomad/CMakeFiles/std_msgs_generate_messages_py +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 diff --git a/build/CMakeFiles/CMakeSystem.cmake b/build/CMakeFiles/CMakeSystem.cmake index 60b4e39..036d126 100644 --- a/build/CMakeFiles/CMakeSystem.cmake +++ b/build/CMakeFiles/CMakeSystem.cmake @@ -1,5 +1,6 @@ +<<<<<<< HEAD SET(CMAKE_SYSTEM "Linux-4.1.7+") SET(CMAKE_SYSTEM_NAME "Linux") SET(CMAKE_SYSTEM_VERSION "4.1.7+") @@ -9,6 +10,17 @@ SET(CMAKE_HOST_SYSTEM "Linux-4.1.7+") SET(CMAKE_HOST_SYSTEM_NAME "Linux") SET(CMAKE_HOST_SYSTEM_VERSION "4.1.7+") SET(CMAKE_HOST_SYSTEM_PROCESSOR "armv6l") +======= +SET(CMAKE_SYSTEM "Linux-3.10.17-yocto-standard-r2") +SET(CMAKE_SYSTEM_NAME "Linux") +SET(CMAKE_SYSTEM_VERSION "3.10.17-yocto-standard-r2") +SET(CMAKE_SYSTEM_PROCESSOR "i686") + +SET(CMAKE_HOST_SYSTEM "Linux-3.10.17-yocto-standard-r2") +SET(CMAKE_HOST_SYSTEM_NAME "Linux") +SET(CMAKE_HOST_SYSTEM_VERSION "3.10.17-yocto-standard-r2") +SET(CMAKE_HOST_SYSTEM_PROCESSOR "i686") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 SET(CMAKE_CROSSCOMPILING "FALSE") diff --git a/build/CMakeFiles/Makefile.cmake b/build/CMakeFiles/Makefile.cmake index c6113fb..3d657d0 100644 --- a/build/CMakeFiles/Makefile.cmake +++ b/build/CMakeFiles/Makefile.cmake @@ -14,6 +14,7 @@ SET(CMAKE_MAKEFILE_DEPENDS "catkin_generated/order_packages.cmake" "nomad/catkin_generated/ordered_paths.cmake" "nomad/catkin_generated/package.cmake" +<<<<<<< HEAD "/home/nomad/nomad_ws/src/CMakeLists.txt" "/home/nomad/nomad_ws/src/nomad/CMakeLists.txt" "/home/nomad/nomad_ws/src/nomad/package.xml" @@ -96,6 +97,79 @@ SET(CMAKE_MAKEFILE_DEPENDS "/opt/ros/indigo/share/std_msgs/cmake/std_msgsConfig.cmake" "/opt/ros/indigo/share/xmlrpcpp/cmake/xmlrpcppConfig-version.cmake" "/opt/ros/indigo/share/xmlrpcpp/cmake/xmlrpcppConfig.cmake" +======= + "/home/edison/nomad_ws/src/CMakeLists.txt" + "/home/edison/nomad_ws/src/nomad/CMakeLists.txt" + "/home/edison/nomad_ws/src/nomad/package.xml" + "/opt/ros/jade/share/catkin/cmake/../package.xml" + "/opt/ros/jade/share/catkin/cmake/all.cmake" + "/opt/ros/jade/share/catkin/cmake/assert.cmake" + "/opt/ros/jade/share/catkin/cmake/atomic_configure_file.cmake" + "/opt/ros/jade/share/catkin/cmake/catkinConfig-version.cmake" + "/opt/ros/jade/share/catkin/cmake/catkinConfig.cmake" + "/opt/ros/jade/share/catkin/cmake/catkin_add_env_hooks.cmake" + "/opt/ros/jade/share/catkin/cmake/catkin_destinations.cmake" + "/opt/ros/jade/share/catkin/cmake/catkin_download.cmake" + "/opt/ros/jade/share/catkin/cmake/catkin_generate_environment.cmake" + "/opt/ros/jade/share/catkin/cmake/catkin_install_python.cmake" + "/opt/ros/jade/share/catkin/cmake/catkin_libraries.cmake" + "/opt/ros/jade/share/catkin/cmake/catkin_metapackage.cmake" + "/opt/ros/jade/share/catkin/cmake/catkin_package.cmake" + "/opt/ros/jade/share/catkin/cmake/catkin_package_xml.cmake" + "/opt/ros/jade/share/catkin/cmake/catkin_python_setup.cmake" + "/opt/ros/jade/share/catkin/cmake/catkin_workspace.cmake" + "/opt/ros/jade/share/catkin/cmake/debug_message.cmake" + "/opt/ros/jade/share/catkin/cmake/em/order_packages.cmake.em" + "/opt/ros/jade/share/catkin/cmake/em/pkg.pc.em" + "/opt/ros/jade/share/catkin/cmake/em_expand.cmake" + "/opt/ros/jade/share/catkin/cmake/empy.cmake" + "/opt/ros/jade/share/catkin/cmake/find_program_required.cmake" + "/opt/ros/jade/share/catkin/cmake/interrogate_setup_dot_py.py" + "/opt/ros/jade/share/catkin/cmake/legacy.cmake" + "/opt/ros/jade/share/catkin/cmake/list_append_deduplicate.cmake" + "/opt/ros/jade/share/catkin/cmake/list_append_unique.cmake" + "/opt/ros/jade/share/catkin/cmake/list_insert_in_workspace_order.cmake" + "/opt/ros/jade/share/catkin/cmake/platform/lsb.cmake" + "/opt/ros/jade/share/catkin/cmake/platform/ubuntu.cmake" + "/opt/ros/jade/share/catkin/cmake/platform/windows.cmake" + "/opt/ros/jade/share/catkin/cmake/python.cmake" + "/opt/ros/jade/share/catkin/cmake/safe_execute_process.cmake" + "/opt/ros/jade/share/catkin/cmake/stamp.cmake" + "/opt/ros/jade/share/catkin/cmake/string_starts_with.cmake" + "/opt/ros/jade/share/catkin/cmake/templates/_setup_util.py.in" + "/opt/ros/jade/share/catkin/cmake/templates/env.sh.in" + "/opt/ros/jade/share/catkin/cmake/templates/generate_cached_setup.py.in" + "/opt/ros/jade/share/catkin/cmake/templates/order_packages.context.py.in" + "/opt/ros/jade/share/catkin/cmake/templates/pkg.context.pc.in" + "/opt/ros/jade/share/catkin/cmake/templates/pkgConfig-version.cmake.in" + "/opt/ros/jade/share/catkin/cmake/templates/pkgConfig.cmake.in" + "/opt/ros/jade/share/catkin/cmake/templates/rosinstall.in" + "/opt/ros/jade/share/catkin/cmake/templates/setup.bash.in" + "/opt/ros/jade/share/catkin/cmake/templates/setup.sh.in" + "/opt/ros/jade/share/catkin/cmake/templates/setup.zsh.in" + "/opt/ros/jade/share/catkin/cmake/test/catkin_download_test_data.cmake" + "/opt/ros/jade/share/catkin/cmake/test/gtest.cmake" + "/opt/ros/jade/share/catkin/cmake/test/nosetests.cmake" + "/opt/ros/jade/share/catkin/cmake/test/tests.cmake" + "/opt/ros/jade/share/catkin/cmake/tools/doxygen.cmake" + "/opt/ros/jade/share/catkin/cmake/tools/libraries.cmake" + "/opt/ros/jade/share/catkin/cmake/tools/rt.cmake" + "/opt/ros/jade/share/cpp_common/cmake/cpp_commonConfig-version.cmake" + "/opt/ros/jade/share/cpp_common/cmake/cpp_commonConfig.cmake" + "/opt/ros/jade/share/message_runtime/cmake/message_runtimeConfig-version.cmake" + "/opt/ros/jade/share/message_runtime/cmake/message_runtimeConfig.cmake" + "/opt/ros/jade/share/roscpp_serialization/cmake/roscpp_serializationConfig-version.cmake" + "/opt/ros/jade/share/roscpp_serialization/cmake/roscpp_serializationConfig.cmake" + "/opt/ros/jade/share/roscpp_traits/cmake/roscpp_traitsConfig-version.cmake" + "/opt/ros/jade/share/roscpp_traits/cmake/roscpp_traitsConfig.cmake" + "/opt/ros/jade/share/rospy/cmake/rospyConfig-version.cmake" + "/opt/ros/jade/share/rospy/cmake/rospyConfig.cmake" + "/opt/ros/jade/share/rostime/cmake/rostimeConfig-version.cmake" + "/opt/ros/jade/share/rostime/cmake/rostimeConfig.cmake" + "/opt/ros/jade/share/std_msgs/cmake/std_msgs-msg-extras.cmake" + "/opt/ros/jade/share/std_msgs/cmake/std_msgsConfig-version.cmake" + "/opt/ros/jade/share/std_msgs/cmake/std_msgsConfig.cmake" +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 "/usr/share/cmake-2.8/Modules/CMakeCInformation.cmake" "/usr/share/cmake-2.8/Modules/CMakeCXXInformation.cmake" "/usr/share/cmake-2.8/Modules/CMakeCommonLanguageInclude.cmake" @@ -146,6 +220,7 @@ SET(CMAKE_DEPEND_INFO_FILES "CMakeFiles/tests.dir/DependInfo.cmake" "gtest/CMakeFiles/gtest.dir/DependInfo.cmake" "gtest/CMakeFiles/gtest_main.dir/DependInfo.cmake" +<<<<<<< HEAD "nomad/CMakeFiles/roscpp_generate_messages_cpp.dir/DependInfo.cmake" "nomad/CMakeFiles/roscpp_generate_messages_lisp.dir/DependInfo.cmake" "nomad/CMakeFiles/roscpp_generate_messages_py.dir/DependInfo.cmake" @@ -153,6 +228,10 @@ SET(CMAKE_DEPEND_INFO_FILES "nomad/CMakeFiles/rosgraph_msgs_generate_messages_lisp.dir/DependInfo.cmake" "nomad/CMakeFiles/rosgraph_msgs_generate_messages_py.dir/DependInfo.cmake" "nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/DependInfo.cmake" +======= + "nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/DependInfo.cmake" + "nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/DependInfo.cmake" +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 "nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/DependInfo.cmake" "nomad/CMakeFiles/std_msgs_generate_messages_py.dir/DependInfo.cmake" ) diff --git a/build/CMakeFiles/Makefile2 b/build/CMakeFiles/Makefile2 index 260d30b..9e60bbc 100644 --- a/build/CMakeFiles/Makefile2 +++ b/build/CMakeFiles/Makefile2 @@ -47,10 +47,17 @@ RM = /usr/bin/cmake -E remove -f EQUALS = = # The top-level source directory on which CMake was run. +<<<<<<< HEAD CMAKE_SOURCE_DIR = /home/nomad/nomad_ws/src # The top-level build directory on which CMake was run. CMAKE_BINARY_DIR = /home/nomad/nomad_ws/build +======= +CMAKE_SOURCE_DIR = /home/edison/nomad_ws/src + +# The top-level build directory on which CMake was run. +CMAKE_BINARY_DIR = /home/edison/nomad_ws/build +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 #============================================================================= # Target rules for target CMakeFiles/clean_test_results.dir @@ -59,15 +66,25 @@ CMAKE_BINARY_DIR = /home/nomad/nomad_ws/build CMakeFiles/clean_test_results.dir/all: $(MAKE) -f CMakeFiles/clean_test_results.dir/build.make CMakeFiles/clean_test_results.dir/depend $(MAKE) -f CMakeFiles/clean_test_results.dir/build.make CMakeFiles/clean_test_results.dir/build +<<<<<<< HEAD $(CMAKE_COMMAND) -E cmake_progress_report /home/nomad/nomad_ws/build/CMakeFiles +======= + $(CMAKE_COMMAND) -E cmake_progress_report /home/edison/nomad_ws/build/CMakeFiles +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 @echo "Built target clean_test_results" .PHONY : CMakeFiles/clean_test_results.dir/all # Build rule for subdir invocation for target. CMakeFiles/clean_test_results.dir/rule: cmake_check_build_system +<<<<<<< HEAD $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles 0 $(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/clean_test_results.dir/all $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles 0 +======= + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 0 + $(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/clean_test_results.dir/all + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 0 +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : CMakeFiles/clean_test_results.dir/rule # Convenience name for target. @@ -90,15 +107,25 @@ clean: CMakeFiles/clean_test_results.dir/clean CMakeFiles/clean_test_results_Project.dir/all: $(MAKE) -f CMakeFiles/clean_test_results_Project.dir/build.make CMakeFiles/clean_test_results_Project.dir/depend $(MAKE) -f CMakeFiles/clean_test_results_Project.dir/build.make CMakeFiles/clean_test_results_Project.dir/build +<<<<<<< HEAD $(CMAKE_COMMAND) -E cmake_progress_report /home/nomad/nomad_ws/build/CMakeFiles +======= + $(CMAKE_COMMAND) -E cmake_progress_report /home/edison/nomad_ws/build/CMakeFiles +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 @echo "Built target clean_test_results_Project" .PHONY : CMakeFiles/clean_test_results_Project.dir/all # Build rule for subdir invocation for target. CMakeFiles/clean_test_results_Project.dir/rule: cmake_check_build_system +<<<<<<< HEAD $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles 0 $(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/clean_test_results_Project.dir/all $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles 0 +======= + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 0 + $(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/clean_test_results_Project.dir/all + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 0 +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : CMakeFiles/clean_test_results_Project.dir/rule # Convenience name for target. @@ -121,15 +148,25 @@ clean: CMakeFiles/clean_test_results_Project.dir/clean CMakeFiles/download_extra_data.dir/all: $(MAKE) -f CMakeFiles/download_extra_data.dir/build.make CMakeFiles/download_extra_data.dir/depend $(MAKE) -f CMakeFiles/download_extra_data.dir/build.make CMakeFiles/download_extra_data.dir/build +<<<<<<< HEAD $(CMAKE_COMMAND) -E cmake_progress_report /home/nomad/nomad_ws/build/CMakeFiles +======= + $(CMAKE_COMMAND) -E cmake_progress_report /home/edison/nomad_ws/build/CMakeFiles +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 @echo "Built target download_extra_data" .PHONY : CMakeFiles/download_extra_data.dir/all # Build rule for subdir invocation for target. CMakeFiles/download_extra_data.dir/rule: cmake_check_build_system +<<<<<<< HEAD $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles 0 $(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/download_extra_data.dir/all $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles 0 +======= + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 0 + $(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/download_extra_data.dir/all + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 0 +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : CMakeFiles/download_extra_data.dir/rule # Convenience name for target. @@ -152,15 +189,25 @@ clean: CMakeFiles/download_extra_data.dir/clean CMakeFiles/doxygen.dir/all: $(MAKE) -f CMakeFiles/doxygen.dir/build.make CMakeFiles/doxygen.dir/depend $(MAKE) -f CMakeFiles/doxygen.dir/build.make CMakeFiles/doxygen.dir/build +<<<<<<< HEAD $(CMAKE_COMMAND) -E cmake_progress_report /home/nomad/nomad_ws/build/CMakeFiles +======= + $(CMAKE_COMMAND) -E cmake_progress_report /home/edison/nomad_ws/build/CMakeFiles +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 @echo "Built target doxygen" .PHONY : CMakeFiles/doxygen.dir/all # Build rule for subdir invocation for target. CMakeFiles/doxygen.dir/rule: cmake_check_build_system +<<<<<<< HEAD $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles 0 $(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/doxygen.dir/all $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles 0 +======= + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 0 + $(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/doxygen.dir/all + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 0 +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : CMakeFiles/doxygen.dir/rule # Convenience name for target. @@ -183,15 +230,25 @@ clean: CMakeFiles/doxygen.dir/clean CMakeFiles/run_tests.dir/all: $(MAKE) -f CMakeFiles/run_tests.dir/build.make CMakeFiles/run_tests.dir/depend $(MAKE) -f CMakeFiles/run_tests.dir/build.make CMakeFiles/run_tests.dir/build +<<<<<<< HEAD $(CMAKE_COMMAND) -E cmake_progress_report /home/nomad/nomad_ws/build/CMakeFiles +======= + $(CMAKE_COMMAND) -E cmake_progress_report /home/edison/nomad_ws/build/CMakeFiles +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 @echo "Built target run_tests" .PHONY : CMakeFiles/run_tests.dir/all # Build rule for subdir invocation for target. CMakeFiles/run_tests.dir/rule: cmake_check_build_system +<<<<<<< HEAD $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles 0 $(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/run_tests.dir/all $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles 0 +======= + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 0 + $(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/run_tests.dir/all + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 0 +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : CMakeFiles/run_tests.dir/rule # Convenience name for target. @@ -214,15 +271,25 @@ clean: CMakeFiles/run_tests.dir/clean CMakeFiles/tests.dir/all: $(MAKE) -f CMakeFiles/tests.dir/build.make CMakeFiles/tests.dir/depend $(MAKE) -f CMakeFiles/tests.dir/build.make CMakeFiles/tests.dir/build +<<<<<<< HEAD $(CMAKE_COMMAND) -E cmake_progress_report /home/nomad/nomad_ws/build/CMakeFiles +======= + $(CMAKE_COMMAND) -E cmake_progress_report /home/edison/nomad_ws/build/CMakeFiles +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 @echo "Built target tests" .PHONY : CMakeFiles/tests.dir/all # Build rule for subdir invocation for target. CMakeFiles/tests.dir/rule: cmake_check_build_system +<<<<<<< HEAD $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles 0 $(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/tests.dir/all $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles 0 +======= + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 0 + $(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/tests.dir/all + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 0 +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : CMakeFiles/tests.dir/rule # Convenience name for target. @@ -261,15 +328,25 @@ gtest/preinstall: gtest/CMakeFiles/gtest.dir/all: $(MAKE) -f gtest/CMakeFiles/gtest.dir/build.make gtest/CMakeFiles/gtest.dir/depend $(MAKE) -f gtest/CMakeFiles/gtest.dir/build.make gtest/CMakeFiles/gtest.dir/build +<<<<<<< HEAD $(CMAKE_COMMAND) -E cmake_progress_report /home/nomad/nomad_ws/build/CMakeFiles 1 +======= + $(CMAKE_COMMAND) -E cmake_progress_report /home/edison/nomad_ws/build/CMakeFiles 1 +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 @echo "Built target gtest" .PHONY : gtest/CMakeFiles/gtest.dir/all # Build rule for subdir invocation for target. gtest/CMakeFiles/gtest.dir/rule: cmake_check_build_system +<<<<<<< HEAD $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles 1 $(MAKE) -f CMakeFiles/Makefile2 gtest/CMakeFiles/gtest.dir/all $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles 0 +======= + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 1 + $(MAKE) -f CMakeFiles/Makefile2 gtest/CMakeFiles/gtest.dir/all + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 0 +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : gtest/CMakeFiles/gtest.dir/rule # Convenience name for target. @@ -292,15 +369,25 @@ clean: gtest/CMakeFiles/gtest.dir/clean gtest/CMakeFiles/gtest_main.dir/all: gtest/CMakeFiles/gtest.dir/all $(MAKE) -f gtest/CMakeFiles/gtest_main.dir/build.make gtest/CMakeFiles/gtest_main.dir/depend $(MAKE) -f gtest/CMakeFiles/gtest_main.dir/build.make gtest/CMakeFiles/gtest_main.dir/build +<<<<<<< HEAD $(CMAKE_COMMAND) -E cmake_progress_report /home/nomad/nomad_ws/build/CMakeFiles 2 +======= + $(CMAKE_COMMAND) -E cmake_progress_report /home/edison/nomad_ws/build/CMakeFiles 2 +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 @echo "Built target gtest_main" .PHONY : gtest/CMakeFiles/gtest_main.dir/all # Build rule for subdir invocation for target. gtest/CMakeFiles/gtest_main.dir/rule: cmake_check_build_system +<<<<<<< HEAD $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles 2 $(MAKE) -f CMakeFiles/Makefile2 gtest/CMakeFiles/gtest_main.dir/all $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles 0 +======= + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 2 + $(MAKE) -f CMakeFiles/Makefile2 gtest/CMakeFiles/gtest_main.dir/all + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 0 +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : gtest/CMakeFiles/gtest_main.dir/rule # Convenience name for target. @@ -324,6 +411,7 @@ nomad/all: .PHONY : nomad/all # Convenience name for "clean" pass in the directory. +<<<<<<< HEAD nomad/clean: nomad/CMakeFiles/roscpp_generate_messages_cpp.dir/clean nomad/clean: nomad/CMakeFiles/roscpp_generate_messages_lisp.dir/clean nomad/clean: nomad/CMakeFiles/roscpp_generate_messages_py.dir/clean @@ -331,6 +419,10 @@ nomad/clean: nomad/CMakeFiles/rosgraph_msgs_generate_messages_cpp.dir/clean nomad/clean: nomad/CMakeFiles/rosgraph_msgs_generate_messages_lisp.dir/clean nomad/clean: nomad/CMakeFiles/rosgraph_msgs_generate_messages_py.dir/clean nomad/clean: nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/clean +======= +nomad/clean: nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/clean +nomad/clean: nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/clean +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 nomad/clean: nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/clean nomad/clean: nomad/CMakeFiles/std_msgs_generate_messages_py.dir/clean .PHONY : nomad/clean @@ -340,6 +432,7 @@ nomad/preinstall: .PHONY : nomad/preinstall #============================================================================= +<<<<<<< HEAD # Target rules for target nomad/CMakeFiles/roscpp_generate_messages_cpp.dir # All Build rule for target. @@ -526,21 +619,33 @@ clean: nomad/CMakeFiles/rosgraph_msgs_generate_messages_py.dir/clean .PHONY : clean #============================================================================= +======= +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # Target rules for target nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir # All Build rule for target. nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/all: $(MAKE) -f nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/build.make nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/depend $(MAKE) -f nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/build.make nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/build +<<<<<<< HEAD $(CMAKE_COMMAND) -E cmake_progress_report /home/nomad/nomad_ws/build/CMakeFiles +======= + $(CMAKE_COMMAND) -E cmake_progress_report /home/edison/nomad_ws/build/CMakeFiles +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 @echo "Built target std_msgs_generate_messages_cpp" .PHONY : nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/all # Build rule for subdir invocation for target. nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/rule: cmake_check_build_system +<<<<<<< HEAD $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles 0 $(MAKE) -f CMakeFiles/Makefile2 nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/all $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles 0 +======= + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 0 + $(MAKE) -f CMakeFiles/Makefile2 nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/all + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 0 +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/rule # Convenience name for target. @@ -557,21 +662,65 @@ clean: nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/clean .PHONY : clean #============================================================================= +<<<<<<< HEAD +======= +# Target rules for target nomad/CMakeFiles/std_msgs_generate_messages_eus.dir + +# All Build rule for target. +nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/all: + $(MAKE) -f nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/build.make nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/depend + $(MAKE) -f nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/build.make nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/build + $(CMAKE_COMMAND) -E cmake_progress_report /home/edison/nomad_ws/build/CMakeFiles + @echo "Built target std_msgs_generate_messages_eus" +.PHONY : nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/all + +# Build rule for subdir invocation for target. +nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/rule: cmake_check_build_system + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 0 + $(MAKE) -f CMakeFiles/Makefile2 nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/all + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 0 +.PHONY : nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/rule + +# Convenience name for target. +std_msgs_generate_messages_eus: nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/rule +.PHONY : std_msgs_generate_messages_eus + +# clean rule for target. +nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/clean: + $(MAKE) -f nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/build.make nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/clean +.PHONY : nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/clean + +# clean rule for target. +clean: nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/clean +.PHONY : clean + +#============================================================================= +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # Target rules for target nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir # All Build rule for target. nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/all: $(MAKE) -f nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/build.make nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/depend $(MAKE) -f nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/build.make nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/build +<<<<<<< HEAD $(CMAKE_COMMAND) -E cmake_progress_report /home/nomad/nomad_ws/build/CMakeFiles +======= + $(CMAKE_COMMAND) -E cmake_progress_report /home/edison/nomad_ws/build/CMakeFiles +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 @echo "Built target std_msgs_generate_messages_lisp" .PHONY : nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/all # Build rule for subdir invocation for target. nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/rule: cmake_check_build_system +<<<<<<< HEAD $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles 0 $(MAKE) -f CMakeFiles/Makefile2 nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/all $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles 0 +======= + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 0 + $(MAKE) -f CMakeFiles/Makefile2 nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/all + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 0 +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/rule # Convenience name for target. @@ -594,15 +743,25 @@ clean: nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/clean nomad/CMakeFiles/std_msgs_generate_messages_py.dir/all: $(MAKE) -f nomad/CMakeFiles/std_msgs_generate_messages_py.dir/build.make nomad/CMakeFiles/std_msgs_generate_messages_py.dir/depend $(MAKE) -f nomad/CMakeFiles/std_msgs_generate_messages_py.dir/build.make nomad/CMakeFiles/std_msgs_generate_messages_py.dir/build +<<<<<<< HEAD $(CMAKE_COMMAND) -E cmake_progress_report /home/nomad/nomad_ws/build/CMakeFiles +======= + $(CMAKE_COMMAND) -E cmake_progress_report /home/edison/nomad_ws/build/CMakeFiles +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 @echo "Built target std_msgs_generate_messages_py" .PHONY : nomad/CMakeFiles/std_msgs_generate_messages_py.dir/all # Build rule for subdir invocation for target. nomad/CMakeFiles/std_msgs_generate_messages_py.dir/rule: cmake_check_build_system +<<<<<<< HEAD $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles 0 $(MAKE) -f CMakeFiles/Makefile2 nomad/CMakeFiles/std_msgs_generate_messages_py.dir/all $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles 0 +======= + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 0 + $(MAKE) -f CMakeFiles/Makefile2 nomad/CMakeFiles/std_msgs_generate_messages_py.dir/all + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 0 +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : nomad/CMakeFiles/std_msgs_generate_messages_py.dir/rule # Convenience name for target. diff --git a/build/CMakeFiles/TargetDirectories.txt b/build/CMakeFiles/TargetDirectories.txt index 5787a0d..7fe2ae3 100644 --- a/build/CMakeFiles/TargetDirectories.txt +++ b/build/CMakeFiles/TargetDirectories.txt @@ -1,3 +1,4 @@ +<<<<<<< HEAD /home/nomad/nomad_ws/build/CMakeFiles/clean_test_results.dir /home/nomad/nomad_ws/build/CMakeFiles/clean_test_results_Project.dir /home/nomad/nomad_ws/build/CMakeFiles/download_extra_data.dir @@ -15,3 +16,17 @@ /home/nomad/nomad_ws/build/nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir /home/nomad/nomad_ws/build/nomad/CMakeFiles/std_msgs_generate_messages_py.dir /home/nomad/nomad_ws/build/CMakeFiles/tests.dir +======= +/home/edison/nomad_ws/build/CMakeFiles/clean_test_results.dir +/home/edison/nomad_ws/build/CMakeFiles/clean_test_results_Project.dir +/home/edison/nomad_ws/build/CMakeFiles/download_extra_data.dir +/home/edison/nomad_ws/build/CMakeFiles/doxygen.dir +/home/edison/nomad_ws/build/gtest/CMakeFiles/gtest.dir +/home/edison/nomad_ws/build/gtest/CMakeFiles/gtest_main.dir +/home/edison/nomad_ws/build/CMakeFiles/run_tests.dir +/home/edison/nomad_ws/build/nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir +/home/edison/nomad_ws/build/nomad/CMakeFiles/std_msgs_generate_messages_eus.dir +/home/edison/nomad_ws/build/nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir +/home/edison/nomad_ws/build/nomad/CMakeFiles/std_msgs_generate_messages_py.dir +/home/edison/nomad_ws/build/CMakeFiles/tests.dir +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 diff --git a/build/CMakeFiles/clean_test_results.dir/build.make b/build/CMakeFiles/clean_test_results.dir/build.make index de2a7b8..58980d9 100644 --- a/build/CMakeFiles/clean_test_results.dir/build.make +++ b/build/CMakeFiles/clean_test_results.dir/build.make @@ -35,10 +35,17 @@ RM = /usr/bin/cmake -E remove -f EQUALS = = # The top-level source directory on which CMake was run. +<<<<<<< HEAD CMAKE_SOURCE_DIR = /home/nomad/nomad_ws/src # The top-level build directory on which CMake was run. CMAKE_BINARY_DIR = /home/nomad/nomad_ws/build +======= +CMAKE_SOURCE_DIR = /home/edison/nomad_ws/src + +# The top-level build directory on which CMake was run. +CMAKE_BINARY_DIR = /home/edison/nomad_ws/build +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # Utility rule file for clean_test_results. @@ -46,7 +53,11 @@ CMAKE_BINARY_DIR = /home/nomad/nomad_ws/build include CMakeFiles/clean_test_results.dir/progress.make CMakeFiles/clean_test_results: +<<<<<<< HEAD /usr/bin/python /opt/ros/indigo/share/catkin/cmake/test/remove_test_results.py /home/nomad/nomad_ws/build/test_results +======= + /usr/bin/python /opt/ros/jade/share/catkin/cmake/test/remove_test_results.py /home/edison/nomad_ws/build/test_results +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 clean_test_results: CMakeFiles/clean_test_results clean_test_results: CMakeFiles/clean_test_results.dir/build.make @@ -61,6 +72,10 @@ CMakeFiles/clean_test_results.dir/clean: .PHONY : CMakeFiles/clean_test_results.dir/clean CMakeFiles/clean_test_results.dir/depend: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/nomad/nomad_ws/src /home/nomad/nomad_ws/src /home/nomad/nomad_ws/build /home/nomad/nomad_ws/build /home/nomad/nomad_ws/build/CMakeFiles/clean_test_results.dir/DependInfo.cmake --color=$(COLOR) +======= + cd /home/edison/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/edison/nomad_ws/src /home/edison/nomad_ws/src /home/edison/nomad_ws/build /home/edison/nomad_ws/build /home/edison/nomad_ws/build/CMakeFiles/clean_test_results.dir/DependInfo.cmake --color=$(COLOR) +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : CMakeFiles/clean_test_results.dir/depend diff --git a/build/CMakeFiles/clean_test_results_Project.dir/build.make b/build/CMakeFiles/clean_test_results_Project.dir/build.make index f45e773..5d3473f 100644 --- a/build/CMakeFiles/clean_test_results_Project.dir/build.make +++ b/build/CMakeFiles/clean_test_results_Project.dir/build.make @@ -35,10 +35,17 @@ RM = /usr/bin/cmake -E remove -f EQUALS = = # The top-level source directory on which CMake was run. +<<<<<<< HEAD CMAKE_SOURCE_DIR = /home/nomad/nomad_ws/src # The top-level build directory on which CMake was run. CMAKE_BINARY_DIR = /home/nomad/nomad_ws/build +======= +CMAKE_SOURCE_DIR = /home/edison/nomad_ws/src + +# The top-level build directory on which CMake was run. +CMAKE_BINARY_DIR = /home/edison/nomad_ws/build +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # Utility rule file for clean_test_results_Project. @@ -46,7 +53,11 @@ CMAKE_BINARY_DIR = /home/nomad/nomad_ws/build include CMakeFiles/clean_test_results_Project.dir/progress.make CMakeFiles/clean_test_results_Project: +<<<<<<< HEAD /usr/bin/python /opt/ros/indigo/share/catkin/cmake/test/remove_test_results.py /home/nomad/nomad_ws/build/test_results/Project +======= + /usr/bin/python /opt/ros/jade/share/catkin/cmake/test/remove_test_results.py /home/edison/nomad_ws/build/test_results/Project +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 clean_test_results_Project: CMakeFiles/clean_test_results_Project clean_test_results_Project: CMakeFiles/clean_test_results_Project.dir/build.make @@ -61,6 +72,10 @@ CMakeFiles/clean_test_results_Project.dir/clean: .PHONY : CMakeFiles/clean_test_results_Project.dir/clean CMakeFiles/clean_test_results_Project.dir/depend: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/nomad/nomad_ws/src /home/nomad/nomad_ws/src /home/nomad/nomad_ws/build /home/nomad/nomad_ws/build /home/nomad/nomad_ws/build/CMakeFiles/clean_test_results_Project.dir/DependInfo.cmake --color=$(COLOR) +======= + cd /home/edison/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/edison/nomad_ws/src /home/edison/nomad_ws/src /home/edison/nomad_ws/build /home/edison/nomad_ws/build /home/edison/nomad_ws/build/CMakeFiles/clean_test_results_Project.dir/DependInfo.cmake --color=$(COLOR) +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : CMakeFiles/clean_test_results_Project.dir/depend diff --git a/build/CMakeFiles/download_extra_data.dir/build.make b/build/CMakeFiles/download_extra_data.dir/build.make index d1312ea..995c43b 100644 --- a/build/CMakeFiles/download_extra_data.dir/build.make +++ b/build/CMakeFiles/download_extra_data.dir/build.make @@ -35,10 +35,17 @@ RM = /usr/bin/cmake -E remove -f EQUALS = = # The top-level source directory on which CMake was run. +<<<<<<< HEAD CMAKE_SOURCE_DIR = /home/nomad/nomad_ws/src # The top-level build directory on which CMake was run. CMAKE_BINARY_DIR = /home/nomad/nomad_ws/build +======= +CMAKE_SOURCE_DIR = /home/edison/nomad_ws/src + +# The top-level build directory on which CMake was run. +CMAKE_BINARY_DIR = /home/edison/nomad_ws/build +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # Utility rule file for download_extra_data. @@ -60,6 +67,10 @@ CMakeFiles/download_extra_data.dir/clean: .PHONY : CMakeFiles/download_extra_data.dir/clean CMakeFiles/download_extra_data.dir/depend: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/nomad/nomad_ws/src /home/nomad/nomad_ws/src /home/nomad/nomad_ws/build /home/nomad/nomad_ws/build /home/nomad/nomad_ws/build/CMakeFiles/download_extra_data.dir/DependInfo.cmake --color=$(COLOR) +======= + cd /home/edison/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/edison/nomad_ws/src /home/edison/nomad_ws/src /home/edison/nomad_ws/build /home/edison/nomad_ws/build /home/edison/nomad_ws/build/CMakeFiles/download_extra_data.dir/DependInfo.cmake --color=$(COLOR) +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : CMakeFiles/download_extra_data.dir/depend diff --git a/build/CMakeFiles/doxygen.dir/build.make b/build/CMakeFiles/doxygen.dir/build.make index 7017d7e..8049e95 100644 --- a/build/CMakeFiles/doxygen.dir/build.make +++ b/build/CMakeFiles/doxygen.dir/build.make @@ -35,10 +35,17 @@ RM = /usr/bin/cmake -E remove -f EQUALS = = # The top-level source directory on which CMake was run. +<<<<<<< HEAD CMAKE_SOURCE_DIR = /home/nomad/nomad_ws/src # The top-level build directory on which CMake was run. CMAKE_BINARY_DIR = /home/nomad/nomad_ws/build +======= +CMAKE_SOURCE_DIR = /home/edison/nomad_ws/src + +# The top-level build directory on which CMake was run. +CMAKE_BINARY_DIR = /home/edison/nomad_ws/build +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # Utility rule file for doxygen. @@ -60,6 +67,10 @@ CMakeFiles/doxygen.dir/clean: .PHONY : CMakeFiles/doxygen.dir/clean CMakeFiles/doxygen.dir/depend: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/nomad/nomad_ws/src /home/nomad/nomad_ws/src /home/nomad/nomad_ws/build /home/nomad/nomad_ws/build /home/nomad/nomad_ws/build/CMakeFiles/doxygen.dir/DependInfo.cmake --color=$(COLOR) +======= + cd /home/edison/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/edison/nomad_ws/src /home/edison/nomad_ws/src /home/edison/nomad_ws/build /home/edison/nomad_ws/build /home/edison/nomad_ws/build/CMakeFiles/doxygen.dir/DependInfo.cmake --color=$(COLOR) +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : CMakeFiles/doxygen.dir/depend diff --git a/build/CMakeFiles/run_tests.dir/build.make b/build/CMakeFiles/run_tests.dir/build.make index c05d862..801e528 100644 --- a/build/CMakeFiles/run_tests.dir/build.make +++ b/build/CMakeFiles/run_tests.dir/build.make @@ -35,10 +35,17 @@ RM = /usr/bin/cmake -E remove -f EQUALS = = # The top-level source directory on which CMake was run. +<<<<<<< HEAD CMAKE_SOURCE_DIR = /home/nomad/nomad_ws/src # The top-level build directory on which CMake was run. CMAKE_BINARY_DIR = /home/nomad/nomad_ws/build +======= +CMAKE_SOURCE_DIR = /home/edison/nomad_ws/src + +# The top-level build directory on which CMake was run. +CMAKE_BINARY_DIR = /home/edison/nomad_ws/build +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # Utility rule file for run_tests. @@ -60,6 +67,10 @@ CMakeFiles/run_tests.dir/clean: .PHONY : CMakeFiles/run_tests.dir/clean CMakeFiles/run_tests.dir/depend: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/nomad/nomad_ws/src /home/nomad/nomad_ws/src /home/nomad/nomad_ws/build /home/nomad/nomad_ws/build /home/nomad/nomad_ws/build/CMakeFiles/run_tests.dir/DependInfo.cmake --color=$(COLOR) +======= + cd /home/edison/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/edison/nomad_ws/src /home/edison/nomad_ws/src /home/edison/nomad_ws/build /home/edison/nomad_ws/build /home/edison/nomad_ws/build/CMakeFiles/run_tests.dir/DependInfo.cmake --color=$(COLOR) +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : CMakeFiles/run_tests.dir/depend diff --git a/build/CMakeFiles/tests.dir/build.make b/build/CMakeFiles/tests.dir/build.make index 4d63178..cd653ab 100644 --- a/build/CMakeFiles/tests.dir/build.make +++ b/build/CMakeFiles/tests.dir/build.make @@ -35,10 +35,17 @@ RM = /usr/bin/cmake -E remove -f EQUALS = = # The top-level source directory on which CMake was run. +<<<<<<< HEAD CMAKE_SOURCE_DIR = /home/nomad/nomad_ws/src # The top-level build directory on which CMake was run. CMAKE_BINARY_DIR = /home/nomad/nomad_ws/build +======= +CMAKE_SOURCE_DIR = /home/edison/nomad_ws/src + +# The top-level build directory on which CMake was run. +CMAKE_BINARY_DIR = /home/edison/nomad_ws/build +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # Utility rule file for tests. @@ -60,6 +67,10 @@ CMakeFiles/tests.dir/clean: .PHONY : CMakeFiles/tests.dir/clean CMakeFiles/tests.dir/depend: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/nomad/nomad_ws/src /home/nomad/nomad_ws/src /home/nomad/nomad_ws/build /home/nomad/nomad_ws/build /home/nomad/nomad_ws/build/CMakeFiles/tests.dir/DependInfo.cmake --color=$(COLOR) +======= + cd /home/edison/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/edison/nomad_ws/src /home/edison/nomad_ws/src /home/edison/nomad_ws/build /home/edison/nomad_ws/build /home/edison/nomad_ws/build/CMakeFiles/tests.dir/DependInfo.cmake --color=$(COLOR) +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : CMakeFiles/tests.dir/depend diff --git a/build/CTestTestfile.cmake b/build/CTestTestfile.cmake index 5ca24e7..e64a6ff 100644 --- a/build/CTestTestfile.cmake +++ b/build/CTestTestfile.cmake @@ -1,6 +1,11 @@ # CMake generated Testfile for +<<<<<<< HEAD # Source directory: /home/nomad/nomad_ws/src # Build directory: /home/nomad/nomad_ws/build +======= +# Source directory: /home/edison/nomad_ws/src +# Build directory: /home/edison/nomad_ws/build +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # # This file includes the relevent testing commands required for # testing this directory and lists subdirectories to be tested as well. diff --git a/build/Makefile b/build/Makefile index c844513..9c7e4bc 100644 --- a/build/Makefile +++ b/build/Makefile @@ -39,10 +39,17 @@ RM = /usr/bin/cmake -E remove -f EQUALS = = # The top-level source directory on which CMake was run. +<<<<<<< HEAD CMAKE_SOURCE_DIR = /home/nomad/nomad_ws/src # The top-level build directory on which CMake was run. CMAKE_BINARY_DIR = /home/nomad/nomad_ws/build +======= +CMAKE_SOURCE_DIR = /home/edison/nomad_ws/src + +# The top-level build directory on which CMake was run. +CMAKE_BINARY_DIR = /home/edison/nomad_ws/build +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 #============================================================================= # Targets provided globally by CMake. @@ -120,9 +127,15 @@ test/fast: test # The main all target all: cmake_check_build_system +<<<<<<< HEAD $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles /home/nomad/nomad_ws/build/CMakeFiles/progress.marks $(MAKE) -f CMakeFiles/Makefile2 all $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles 0 +======= + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles /home/edison/nomad_ws/build/CMakeFiles/progress.marks + $(MAKE) -f CMakeFiles/Makefile2 all + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 0 +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : all # The main clean target @@ -254,6 +267,7 @@ gtest_main/fast: .PHONY : gtest_main/fast #============================================================================= +<<<<<<< HEAD # Target rules for targets named roscpp_generate_messages_cpp # Build rule for target. @@ -332,6 +346,8 @@ rosgraph_msgs_generate_messages_py/fast: .PHONY : rosgraph_msgs_generate_messages_py/fast #============================================================================= +======= +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # Target rules for targets named std_msgs_generate_messages_cpp # Build rule for target. @@ -345,6 +361,22 @@ std_msgs_generate_messages_cpp/fast: .PHONY : std_msgs_generate_messages_cpp/fast #============================================================================= +<<<<<<< HEAD +======= +# Target rules for targets named std_msgs_generate_messages_eus + +# Build rule for target. +std_msgs_generate_messages_eus: cmake_check_build_system + $(MAKE) -f CMakeFiles/Makefile2 std_msgs_generate_messages_eus +.PHONY : std_msgs_generate_messages_eus + +# fast build rule for target. +std_msgs_generate_messages_eus/fast: + $(MAKE) -f nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/build.make nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/build +.PHONY : std_msgs_generate_messages_eus/fast + +#============================================================================= +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # Target rules for targets named std_msgs_generate_messages_lisp # Build rule for target. @@ -391,6 +423,7 @@ help: @echo "... tests" @echo "... gtest" @echo "... gtest_main" +<<<<<<< HEAD @echo "... roscpp_generate_messages_cpp" @echo "... roscpp_generate_messages_lisp" @echo "... roscpp_generate_messages_py" @@ -398,6 +431,10 @@ help: @echo "... rosgraph_msgs_generate_messages_lisp" @echo "... rosgraph_msgs_generate_messages_py" @echo "... std_msgs_generate_messages_cpp" +======= + @echo "... std_msgs_generate_messages_cpp" + @echo "... std_msgs_generate_messages_eus" +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 @echo "... std_msgs_generate_messages_lisp" @echo "... std_msgs_generate_messages_py" .PHONY : help diff --git a/build/catkin/catkin_generated/version/package.cmake b/build/catkin/catkin_generated/version/package.cmake index 5c0c84c..7bf54ed 100644 --- a/build/catkin/catkin_generated/version/package.cmake +++ b/build/catkin/catkin_generated/version/package.cmake @@ -1,5 +1,9 @@ set(_CATKIN_CURRENT_PACKAGE "catkin") +<<<<<<< HEAD set(catkin_VERSION "0.6.16") +======= +set(catkin_VERSION "0.6.15") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 set(catkin_BUILD_DEPENDS_python-catkin-pkg_VERSION_GT "0.2.9") set(catkin_BUILD_DEPENDS "python-empy" "python-argparse" "python-catkin-pkg") set(catkin_DEPRECATED "") diff --git a/build/catkin_generated/generate_cached_setup.py b/build/catkin_generated/generate_cached_setup.py index d79aa5d..7094282 100644 --- a/build/catkin_generated/generate_cached_setup.py +++ b/build/catkin_generated/generate_cached_setup.py @@ -6,22 +6,37 @@ import sys # find the import for catkin's python package - either from source space or from an installed underlay +<<<<<<< HEAD if os.path.exists(os.path.join('/opt/ros/indigo/share/catkin/cmake', 'catkinConfig.cmake.in')): sys.path.insert(0, os.path.join('/opt/ros/indigo/share/catkin/cmake', '..', 'python')) +======= +if os.path.exists(os.path.join('/opt/ros/jade/share/catkin/cmake', 'catkinConfig.cmake.in')): + sys.path.insert(0, os.path.join('/opt/ros/jade/share/catkin/cmake', '..', 'python')) +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 try: from catkin.environment_cache import generate_environment_script except ImportError: # search for catkin package in all workspaces and prepend to path +<<<<<<< HEAD for workspace in "/home/nomad/nomad_ws/devel;/opt/ros/indigo".split(';'): +======= + for workspace in "/home/edison/nomad_ws/devel;/opt/ros/jade".split(';'): +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 python_path = os.path.join(workspace, 'lib/python2.7/dist-packages') if os.path.isdir(os.path.join(python_path, 'catkin')): sys.path.insert(0, python_path) break from catkin.environment_cache import generate_environment_script +<<<<<<< HEAD code = generate_environment_script('/home/nomad/nomad_ws/devel/env.sh') output_filename = '/home/nomad/nomad_ws/build/catkin_generated/setup_cached.sh' +======= +code = generate_environment_script('/home/edison/nomad_ws/devel/env.sh') + +output_filename = '/home/edison/nomad_ws/build/catkin_generated/setup_cached.sh' +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 with open(output_filename, 'w') as f: #print('Generate script for cached setup "%s"' % output_filename) f.write('\n'.join(code)) diff --git a/build/catkin_generated/installspace/.rosinstall b/build/catkin_generated/installspace/.rosinstall index 9b84402..8ca5cb2 100644 --- a/build/catkin_generated/installspace/.rosinstall +++ b/build/catkin_generated/installspace/.rosinstall @@ -1,2 +1,6 @@ - setup-file: +<<<<<<< HEAD local-name: /home/nomad/nomad_ws/install/setup.sh +======= + local-name: /home/edison/nomad_ws/install/setup.sh +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 diff --git a/build/catkin_generated/installspace/_setup_util.py b/build/catkin_generated/installspace/_setup_util.py index 1b151be..d103985 100755 --- a/build/catkin_generated/installspace/_setup_util.py +++ b/build/catkin_generated/installspace/_setup_util.py @@ -53,9 +53,15 @@ ENV_VAR_SUBFOLDERS = { 'CMAKE_PREFIX_PATH': '', 'CPATH': 'include', +<<<<<<< HEAD 'LD_LIBRARY_PATH' if not IS_DARWIN else 'DYLD_LIBRARY_PATH': ['lib', os.path.join('lib', 'arm-linux-gnueabihf')], 'PATH': 'bin', 'PKG_CONFIG_PATH': [os.path.join('lib', 'pkgconfig'), os.path.join('lib', 'arm-linux-gnueabihf', 'pkgconfig')], +======= + 'LD_LIBRARY_PATH' if not IS_DARWIN else 'DYLD_LIBRARY_PATH': ['lib', os.path.join('lib', 'i386-linux-gnu')], + 'PATH': 'bin', + 'PKG_CONFIG_PATH': [os.path.join('lib', 'pkgconfig'), os.path.join('lib', 'i386-linux-gnu', 'pkgconfig')], +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 'PYTHONPATH': 'lib/python2.7/dist-packages', } @@ -260,7 +266,11 @@ def _parse_arguments(args=None): sys.exit(1) # environment at generation time +<<<<<<< HEAD CMAKE_PREFIX_PATH = '/home/nomad/nomad_ws/devel;/opt/ros/indigo'.split(';') +======= + CMAKE_PREFIX_PATH = '/home/edison/nomad_ws/devel;/opt/ros/jade'.split(';') +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # prepend current workspace if not already part of CPP base_path = os.path.dirname(__file__) if base_path not in CMAKE_PREFIX_PATH: diff --git a/build/catkin_generated/installspace/setup.sh b/build/catkin_generated/installspace/setup.sh index 27978aa..68655d8 100644 --- a/build/catkin_generated/installspace/setup.sh +++ b/build/catkin_generated/installspace/setup.sh @@ -8,7 +8,11 @@ # since this file is sourced either use the provided _CATKIN_SETUP_DIR # or fall back to the destination set at configure time +<<<<<<< HEAD : ${_CATKIN_SETUP_DIR:=/home/nomad/nomad_ws/install} +======= +: ${_CATKIN_SETUP_DIR:=/home/edison/nomad_ws/install} +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 _SETUP_UTIL="$_CATKIN_SETUP_DIR/_setup_util.py" unset _CATKIN_SETUP_DIR diff --git a/build/catkin_generated/order_packages.py b/build/catkin_generated/order_packages.py index 1988ca8..7276aa5 100644 --- a/build/catkin_generated/order_packages.py +++ b/build/catkin_generated/order_packages.py @@ -1,5 +1,12 @@ # generated from catkin/cmake/template/order_packages.context.py.in +<<<<<<< HEAD source_root_dir = "/home/nomad/nomad_ws/src" whitelisted_packages = "".split(';') if "" != "" else [] blacklisted_packages = "".split(';') if "" != "" else [] underlay_workspaces = "/home/nomad/nomad_ws/devel;/opt/ros/indigo".split(';') if "/home/nomad/nomad_ws/devel;/opt/ros/indigo" != "" else [] +======= +source_root_dir = "/home/edison/nomad_ws/src" +whitelisted_packages = "".split(';') if "" != "" else [] +blacklisted_packages = "".split(';') if "" != "" else [] +underlay_workspaces = "/home/edison/nomad_ws/devel;/opt/ros/jade".split(';') if "/home/edison/nomad_ws/devel;/opt/ros/jade" != "" else [] +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 diff --git a/build/catkin_generated/setup_cached.sh b/build/catkin_generated/setup_cached.sh index 8edc767..3956b95 100755 --- a/build/catkin_generated/setup_cached.sh +++ b/build/catkin_generated/setup_cached.sh @@ -7,6 +7,12 @@ # new environment variables # modified environment variables +<<<<<<< HEAD export LD_LIBRARY_PATH="/home/nomad/nomad_ws/devel/lib/arm-linux-gnueabihf:/opt/ros/indigo/lib/arm-linux-gnueabihf:/home/nomad/nomad_ws/devel/lib:/opt/ros/indigo/lib" export PKG_CONFIG_PATH="/home/nomad/nomad_ws/devel/lib/arm-linux-gnueabihf/pkgconfig:/opt/ros/indigo/lib/arm-linux-gnueabihf/pkgconfig:/home/nomad/nomad_ws/devel/lib/pkgconfig:/opt/ros/indigo/lib/pkgconfig" -export PWD="/home/nomad/nomad_ws/build" \ No newline at end of file +export PWD="/home/nomad/nomad_ws/build" +======= +export LD_LIBRARY_PATH="/home/edison/nomad_ws/devel/lib/i386-linux-gnu:/opt/ros/jade/lib/i386-linux-gnu:/home/edison/nomad_ws/devel/lib:/opt/ros/jade/lib" +export PKG_CONFIG_PATH="/home/edison/nomad_ws/devel/lib/i386-linux-gnu/pkgconfig:/opt/ros/jade/lib/i386-linux-gnu/pkgconfig:/home/edison/nomad_ws/devel/lib/pkgconfig:/opt/ros/jade/lib/pkgconfig" +export PWD="/home/edison/nomad_ws/build" +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 diff --git a/build/catkin_generated/stamps/Project/package.xml.stamp b/build/catkin_generated/stamps/Project/package.xml.stamp index 08b9820..b455a29 100644 --- a/build/catkin_generated/stamps/Project/package.xml.stamp +++ b/build/catkin_generated/stamps/Project/package.xml.stamp @@ -1,7 +1,11 @@ catkin +<<<<<<< HEAD 0.6.16 +======= + 0.6.15 +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 Low-level build system macros and infrastructure for ROS. Dirk Thomas BSD diff --git a/build/catkin_make.cache b/build/catkin_make.cache index 9b46e9f..12636f7 100644 --- a/build/catkin_make.cache +++ b/build/catkin_make.cache @@ -1,2 +1,6 @@ nomad --DCATKIN_DEVEL_PREFIX=/home/nomad/nomad_ws/devel -DCMAKE_INSTALL_PREFIX=/home/nomad/nomad_ws/install -G Unix Makefiles \ No newline at end of file +<<<<<<< HEAD +-DCATKIN_DEVEL_PREFIX=/home/nomad/nomad_ws/devel -DCMAKE_INSTALL_PREFIX=/home/nomad/nomad_ws/install -G Unix Makefiles +======= +-DCATKIN_DEVEL_PREFIX=/home/edison/nomad_ws/devel -DCMAKE_INSTALL_PREFIX=/home/edison/nomad_ws/install -G Unix Makefiles +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 diff --git a/build/cmake_install.cmake b/build/cmake_install.cmake index 4bb0d67..ceaf7e1 100644 --- a/build/cmake_install.cmake +++ b/build/cmake_install.cmake @@ -1,8 +1,16 @@ +<<<<<<< HEAD # Install script for directory: /home/nomad/nomad_ws/src # Set the install prefix IF(NOT DEFINED CMAKE_INSTALL_PREFIX) SET(CMAKE_INSTALL_PREFIX "/home/nomad/nomad_ws/install") +======= +# Install script for directory: /home/edison/nomad_ws/src + +# Set the install prefix +IF(NOT DEFINED CMAKE_INSTALL_PREFIX) + SET(CMAKE_INSTALL_PREFIX "/home/edison/nomad_ws/install") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") @@ -44,80 +52,133 @@ ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unsp IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") list(APPEND CMAKE_ABSOLUTE_DESTINATION_FILES +<<<<<<< HEAD "/home/nomad/nomad_ws/install/_setup_util.py") +======= + "/home/edison/nomad_ws/install/_setup_util.py") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 IF (CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION) message(WARNING "ABSOLUTE path INSTALL DESTINATION : ${CMAKE_ABSOLUTE_DESTINATION_FILES}") ENDIF (CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION) IF (CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION) message(FATAL_ERROR "ABSOLUTE path INSTALL DESTINATION forbidden (by caller): ${CMAKE_ABSOLUTE_DESTINATION_FILES}") ENDIF (CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION) +<<<<<<< HEAD FILE(INSTALL DESTINATION "/home/nomad/nomad_ws/install" TYPE PROGRAM FILES "/home/nomad/nomad_ws/build/catkin_generated/installspace/_setup_util.py") +======= +FILE(INSTALL DESTINATION "/home/edison/nomad_ws/install" TYPE PROGRAM FILES "/home/edison/nomad_ws/build/catkin_generated/installspace/_setup_util.py") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") list(APPEND CMAKE_ABSOLUTE_DESTINATION_FILES +<<<<<<< HEAD "/home/nomad/nomad_ws/install/env.sh") +======= + "/home/edison/nomad_ws/install/env.sh") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 IF (CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION) message(WARNING "ABSOLUTE path INSTALL DESTINATION : ${CMAKE_ABSOLUTE_DESTINATION_FILES}") ENDIF (CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION) IF (CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION) message(FATAL_ERROR "ABSOLUTE path INSTALL DESTINATION forbidden (by caller): ${CMAKE_ABSOLUTE_DESTINATION_FILES}") ENDIF (CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION) +<<<<<<< HEAD FILE(INSTALL DESTINATION "/home/nomad/nomad_ws/install" TYPE PROGRAM FILES "/home/nomad/nomad_ws/build/catkin_generated/installspace/env.sh") +======= +FILE(INSTALL DESTINATION "/home/edison/nomad_ws/install" TYPE PROGRAM FILES "/home/edison/nomad_ws/build/catkin_generated/installspace/env.sh") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") list(APPEND CMAKE_ABSOLUTE_DESTINATION_FILES +<<<<<<< HEAD "/home/nomad/nomad_ws/install/setup.bash") +======= + "/home/edison/nomad_ws/install/setup.bash") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 IF (CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION) message(WARNING "ABSOLUTE path INSTALL DESTINATION : ${CMAKE_ABSOLUTE_DESTINATION_FILES}") ENDIF (CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION) IF (CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION) message(FATAL_ERROR "ABSOLUTE path INSTALL DESTINATION forbidden (by caller): ${CMAKE_ABSOLUTE_DESTINATION_FILES}") ENDIF (CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION) +<<<<<<< HEAD FILE(INSTALL DESTINATION "/home/nomad/nomad_ws/install" TYPE FILE FILES "/home/nomad/nomad_ws/build/catkin_generated/installspace/setup.bash") +======= +FILE(INSTALL DESTINATION "/home/edison/nomad_ws/install" TYPE FILE FILES "/home/edison/nomad_ws/build/catkin_generated/installspace/setup.bash") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") list(APPEND CMAKE_ABSOLUTE_DESTINATION_FILES +<<<<<<< HEAD "/home/nomad/nomad_ws/install/setup.sh") +======= + "/home/edison/nomad_ws/install/setup.sh") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 IF (CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION) message(WARNING "ABSOLUTE path INSTALL DESTINATION : ${CMAKE_ABSOLUTE_DESTINATION_FILES}") ENDIF (CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION) IF (CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION) message(FATAL_ERROR "ABSOLUTE path INSTALL DESTINATION forbidden (by caller): ${CMAKE_ABSOLUTE_DESTINATION_FILES}") ENDIF (CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION) +<<<<<<< HEAD FILE(INSTALL DESTINATION "/home/nomad/nomad_ws/install" TYPE FILE FILES "/home/nomad/nomad_ws/build/catkin_generated/installspace/setup.sh") +======= +FILE(INSTALL DESTINATION "/home/edison/nomad_ws/install" TYPE FILE FILES "/home/edison/nomad_ws/build/catkin_generated/installspace/setup.sh") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") list(APPEND CMAKE_ABSOLUTE_DESTINATION_FILES +<<<<<<< HEAD "/home/nomad/nomad_ws/install/setup.zsh") +======= + "/home/edison/nomad_ws/install/setup.zsh") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 IF (CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION) message(WARNING "ABSOLUTE path INSTALL DESTINATION : ${CMAKE_ABSOLUTE_DESTINATION_FILES}") ENDIF (CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION) IF (CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION) message(FATAL_ERROR "ABSOLUTE path INSTALL DESTINATION forbidden (by caller): ${CMAKE_ABSOLUTE_DESTINATION_FILES}") ENDIF (CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION) +<<<<<<< HEAD FILE(INSTALL DESTINATION "/home/nomad/nomad_ws/install" TYPE FILE FILES "/home/nomad/nomad_ws/build/catkin_generated/installspace/setup.zsh") +======= +FILE(INSTALL DESTINATION "/home/edison/nomad_ws/install" TYPE FILE FILES "/home/edison/nomad_ws/build/catkin_generated/installspace/setup.zsh") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") list(APPEND CMAKE_ABSOLUTE_DESTINATION_FILES +<<<<<<< HEAD "/home/nomad/nomad_ws/install/.rosinstall") +======= + "/home/edison/nomad_ws/install/.rosinstall") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 IF (CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION) message(WARNING "ABSOLUTE path INSTALL DESTINATION : ${CMAKE_ABSOLUTE_DESTINATION_FILES}") ENDIF (CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION) IF (CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION) message(FATAL_ERROR "ABSOLUTE path INSTALL DESTINATION forbidden (by caller): ${CMAKE_ABSOLUTE_DESTINATION_FILES}") ENDIF (CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION) +<<<<<<< HEAD FILE(INSTALL DESTINATION "/home/nomad/nomad_ws/install" TYPE FILE FILES "/home/nomad/nomad_ws/build/catkin_generated/installspace/.rosinstall") +======= +FILE(INSTALL DESTINATION "/home/edison/nomad_ws/install" TYPE FILE FILES "/home/edison/nomad_ws/build/catkin_generated/installspace/.rosinstall") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") IF(NOT CMAKE_INSTALL_LOCAL_ONLY) # Include the install script for each subdirectory. +<<<<<<< HEAD INCLUDE("/home/nomad/nomad_ws/build/gtest/cmake_install.cmake") INCLUDE("/home/nomad/nomad_ws/build/nomad/cmake_install.cmake") +======= + INCLUDE("/home/edison/nomad_ws/build/gtest/cmake_install.cmake") + INCLUDE("/home/edison/nomad_ws/build/nomad/cmake_install.cmake") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ENDIF(NOT CMAKE_INSTALL_LOCAL_ONLY) @@ -127,7 +188,13 @@ ELSE(CMAKE_INSTALL_COMPONENT) SET(CMAKE_INSTALL_MANIFEST "install_manifest.txt") ENDIF(CMAKE_INSTALL_COMPONENT) +<<<<<<< HEAD FILE(WRITE "/home/nomad/nomad_ws/build/${CMAKE_INSTALL_MANIFEST}" "") FOREACH(file ${CMAKE_INSTALL_MANIFEST_FILES}) FILE(APPEND "/home/nomad/nomad_ws/build/${CMAKE_INSTALL_MANIFEST}" "${file}\n") +======= +FILE(WRITE "/home/edison/nomad_ws/build/${CMAKE_INSTALL_MANIFEST}" "") +FOREACH(file ${CMAKE_INSTALL_MANIFEST_FILES}) + FILE(APPEND "/home/edison/nomad_ws/build/${CMAKE_INSTALL_MANIFEST}" "${file}\n") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ENDFOREACH(file) diff --git a/build/gtest/CMakeFiles/CMakeDirectoryInformation.cmake b/build/gtest/CMakeFiles/CMakeDirectoryInformation.cmake index 99c124f..2ae4428 100644 --- a/build/gtest/CMakeFiles/CMakeDirectoryInformation.cmake +++ b/build/gtest/CMakeFiles/CMakeDirectoryInformation.cmake @@ -3,7 +3,11 @@ # Relative path conversion top directories. SET(CMAKE_RELATIVE_PATH_TOP_SOURCE "/usr/src/gtest") +<<<<<<< HEAD SET(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/nomad/nomad_ws/build") +======= +SET(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/edison/nomad_ws/build") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # Force unix paths in dependencies. SET(CMAKE_FORCE_UNIX_PATHS 1) diff --git a/build/gtest/CMakeFiles/gtest.dir/DependInfo.cmake b/build/gtest/CMakeFiles/gtest.dir/DependInfo.cmake index 718be59..faf1250 100644 --- a/build/gtest/CMakeFiles/gtest.dir/DependInfo.cmake +++ b/build/gtest/CMakeFiles/gtest.dir/DependInfo.cmake @@ -4,7 +4,11 @@ SET(CMAKE_DEPENDS_LANGUAGES ) # The set of files for implicit dependencies of each language: SET(CMAKE_DEPENDS_CHECK_CXX +<<<<<<< HEAD "/usr/src/gtest/src/gtest-all.cc" "/home/nomad/nomad_ws/build/gtest/CMakeFiles/gtest.dir/src/gtest-all.cc.o" +======= + "/usr/src/gtest/src/gtest-all.cc" "/home/edison/nomad_ws/build/gtest/CMakeFiles/gtest.dir/src/gtest-all.cc.o" +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ) SET(CMAKE_CXX_COMPILER_ID "GNU") diff --git a/build/gtest/CMakeFiles/gtest.dir/build.make b/build/gtest/CMakeFiles/gtest.dir/build.make index d183c53..8ddf781 100644 --- a/build/gtest/CMakeFiles/gtest.dir/build.make +++ b/build/gtest/CMakeFiles/gtest.dir/build.make @@ -35,10 +35,17 @@ RM = /usr/bin/cmake -E remove -f EQUALS = = # The top-level source directory on which CMake was run. +<<<<<<< HEAD CMAKE_SOURCE_DIR = /home/nomad/nomad_ws/src # The top-level build directory on which CMake was run. CMAKE_BINARY_DIR = /home/nomad/nomad_ws/build +======= +CMAKE_SOURCE_DIR = /home/edison/nomad_ws/src + +# The top-level build directory on which CMake was run. +CMAKE_BINARY_DIR = /home/edison/nomad_ws/build +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # Include any dependencies generated for this target. include gtest/CMakeFiles/gtest.dir/depend.make @@ -51,6 +58,7 @@ include gtest/CMakeFiles/gtest.dir/flags.make gtest/CMakeFiles/gtest.dir/src/gtest-all.cc.o: gtest/CMakeFiles/gtest.dir/flags.make gtest/CMakeFiles/gtest.dir/src/gtest-all.cc.o: /usr/src/gtest/src/gtest-all.cc +<<<<<<< HEAD $(CMAKE_COMMAND) -E cmake_progress_report /home/nomad/nomad_ws/build/CMakeFiles $(CMAKE_PROGRESS_1) @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Building CXX object gtest/CMakeFiles/gtest.dir/src/gtest-all.cc.o" cd /home/nomad/nomad_ws/build/gtest && /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -Wall -Wshadow -DGTEST_HAS_PTHREAD=1 -fexceptions -Wextra -o CMakeFiles/gtest.dir/src/gtest-all.cc.o -c /usr/src/gtest/src/gtest-all.cc @@ -62,6 +70,19 @@ gtest/CMakeFiles/gtest.dir/src/gtest-all.cc.i: cmake_force gtest/CMakeFiles/gtest.dir/src/gtest-all.cc.s: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/gtest.dir/src/gtest-all.cc.s" cd /home/nomad/nomad_ws/build/gtest && /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -Wall -Wshadow -DGTEST_HAS_PTHREAD=1 -fexceptions -Wextra -S /usr/src/gtest/src/gtest-all.cc -o CMakeFiles/gtest.dir/src/gtest-all.cc.s +======= + $(CMAKE_COMMAND) -E cmake_progress_report /home/edison/nomad_ws/build/CMakeFiles $(CMAKE_PROGRESS_1) + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Building CXX object gtest/CMakeFiles/gtest.dir/src/gtest-all.cc.o" + cd /home/edison/nomad_ws/build/gtest && /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -Wall -Wshadow -DGTEST_HAS_PTHREAD=1 -fexceptions -Wextra -o CMakeFiles/gtest.dir/src/gtest-all.cc.o -c /usr/src/gtest/src/gtest-all.cc + +gtest/CMakeFiles/gtest.dir/src/gtest-all.cc.i: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/gtest.dir/src/gtest-all.cc.i" + cd /home/edison/nomad_ws/build/gtest && /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -Wall -Wshadow -DGTEST_HAS_PTHREAD=1 -fexceptions -Wextra -E /usr/src/gtest/src/gtest-all.cc > CMakeFiles/gtest.dir/src/gtest-all.cc.i + +gtest/CMakeFiles/gtest.dir/src/gtest-all.cc.s: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/gtest.dir/src/gtest-all.cc.s" + cd /home/edison/nomad_ws/build/gtest && /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -Wall -Wshadow -DGTEST_HAS_PTHREAD=1 -fexceptions -Wextra -S /usr/src/gtest/src/gtest-all.cc -o CMakeFiles/gtest.dir/src/gtest-all.cc.s +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 gtest/CMakeFiles/gtest.dir/src/gtest-all.cc.o.requires: .PHONY : gtest/CMakeFiles/gtest.dir/src/gtest-all.cc.o.requires @@ -83,7 +104,11 @@ gtest/libgtest.so: gtest/CMakeFiles/gtest.dir/src/gtest-all.cc.o gtest/libgtest.so: gtest/CMakeFiles/gtest.dir/build.make gtest/libgtest.so: gtest/CMakeFiles/gtest.dir/link.txt @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --red --bold "Linking CXX shared library libgtest.so" +<<<<<<< HEAD cd /home/nomad/nomad_ws/build/gtest && $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/gtest.dir/link.txt --verbose=$(VERBOSE) +======= + cd /home/edison/nomad_ws/build/gtest && $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/gtest.dir/link.txt --verbose=$(VERBOSE) +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # Rule to build all files generated by this target. gtest/CMakeFiles/gtest.dir/build: gtest/libgtest.so @@ -93,10 +118,18 @@ gtest/CMakeFiles/gtest.dir/requires: gtest/CMakeFiles/gtest.dir/src/gtest-all.cc .PHONY : gtest/CMakeFiles/gtest.dir/requires gtest/CMakeFiles/gtest.dir/clean: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build/gtest && $(CMAKE_COMMAND) -P CMakeFiles/gtest.dir/cmake_clean.cmake .PHONY : gtest/CMakeFiles/gtest.dir/clean gtest/CMakeFiles/gtest.dir/depend: cd /home/nomad/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/nomad/nomad_ws/src /usr/src/gtest /home/nomad/nomad_ws/build /home/nomad/nomad_ws/build/gtest /home/nomad/nomad_ws/build/gtest/CMakeFiles/gtest.dir/DependInfo.cmake --color=$(COLOR) +======= + cd /home/edison/nomad_ws/build/gtest && $(CMAKE_COMMAND) -P CMakeFiles/gtest.dir/cmake_clean.cmake +.PHONY : gtest/CMakeFiles/gtest.dir/clean + +gtest/CMakeFiles/gtest.dir/depend: + cd /home/edison/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/edison/nomad_ws/src /usr/src/gtest /home/edison/nomad_ws/build /home/edison/nomad_ws/build/gtest /home/edison/nomad_ws/build/gtest/CMakeFiles/gtest.dir/DependInfo.cmake --color=$(COLOR) +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : gtest/CMakeFiles/gtest.dir/depend diff --git a/build/gtest/CMakeFiles/gtest.dir/link.txt b/build/gtest/CMakeFiles/gtest.dir/link.txt index 2695ffb..c360c2f 100644 --- a/build/gtest/CMakeFiles/gtest.dir/link.txt +++ b/build/gtest/CMakeFiles/gtest.dir/link.txt @@ -1 +1,5 @@ +<<<<<<< HEAD /usr/bin/c++ -fPIC -shared -Wl,-soname,libgtest.so -o libgtest.so CMakeFiles/gtest.dir/src/gtest-all.cc.o -L/home/nomad/nomad_ws/build/gtest/src -lpthread -Wl,-rpath,/home/nomad/nomad_ws/build/gtest/src +======= +/usr/bin/c++ -fPIC -shared -Wl,-soname,libgtest.so -o libgtest.so CMakeFiles/gtest.dir/src/gtest-all.cc.o -L/home/edison/nomad_ws/build/gtest/src -lpthread -Wl,-rpath,/home/edison/nomad_ws/build/gtest/src +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 diff --git a/build/gtest/CMakeFiles/gtest_main.dir/DependInfo.cmake b/build/gtest/CMakeFiles/gtest_main.dir/DependInfo.cmake index 5a08b67..21b3ff2 100644 --- a/build/gtest/CMakeFiles/gtest_main.dir/DependInfo.cmake +++ b/build/gtest/CMakeFiles/gtest_main.dir/DependInfo.cmake @@ -4,7 +4,11 @@ SET(CMAKE_DEPENDS_LANGUAGES ) # The set of files for implicit dependencies of each language: SET(CMAKE_DEPENDS_CHECK_CXX +<<<<<<< HEAD "/usr/src/gtest/src/gtest_main.cc" "/home/nomad/nomad_ws/build/gtest/CMakeFiles/gtest_main.dir/src/gtest_main.cc.o" +======= + "/usr/src/gtest/src/gtest_main.cc" "/home/edison/nomad_ws/build/gtest/CMakeFiles/gtest_main.dir/src/gtest_main.cc.o" +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ) SET(CMAKE_CXX_COMPILER_ID "GNU") @@ -15,7 +19,11 @@ SET(CMAKE_TARGET_DEFINITIONS # Targets to which this target links. SET(CMAKE_TARGET_LINKED_INFO_FILES +<<<<<<< HEAD "/home/nomad/nomad_ws/build/gtest/CMakeFiles/gtest.dir/DependInfo.cmake" +======= + "/home/edison/nomad_ws/build/gtest/CMakeFiles/gtest.dir/DependInfo.cmake" +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ) # The include file search paths: diff --git a/build/gtest/CMakeFiles/gtest_main.dir/build.make b/build/gtest/CMakeFiles/gtest_main.dir/build.make index a3c0a39..9092837 100644 --- a/build/gtest/CMakeFiles/gtest_main.dir/build.make +++ b/build/gtest/CMakeFiles/gtest_main.dir/build.make @@ -35,10 +35,17 @@ RM = /usr/bin/cmake -E remove -f EQUALS = = # The top-level source directory on which CMake was run. +<<<<<<< HEAD CMAKE_SOURCE_DIR = /home/nomad/nomad_ws/src # The top-level build directory on which CMake was run. CMAKE_BINARY_DIR = /home/nomad/nomad_ws/build +======= +CMAKE_SOURCE_DIR = /home/edison/nomad_ws/src + +# The top-level build directory on which CMake was run. +CMAKE_BINARY_DIR = /home/edison/nomad_ws/build +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # Include any dependencies generated for this target. include gtest/CMakeFiles/gtest_main.dir/depend.make @@ -51,6 +58,7 @@ include gtest/CMakeFiles/gtest_main.dir/flags.make gtest/CMakeFiles/gtest_main.dir/src/gtest_main.cc.o: gtest/CMakeFiles/gtest_main.dir/flags.make gtest/CMakeFiles/gtest_main.dir/src/gtest_main.cc.o: /usr/src/gtest/src/gtest_main.cc +<<<<<<< HEAD $(CMAKE_COMMAND) -E cmake_progress_report /home/nomad/nomad_ws/build/CMakeFiles $(CMAKE_PROGRESS_1) @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Building CXX object gtest/CMakeFiles/gtest_main.dir/src/gtest_main.cc.o" cd /home/nomad/nomad_ws/build/gtest && /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -Wall -Wshadow -DGTEST_HAS_PTHREAD=1 -fexceptions -Wextra -o CMakeFiles/gtest_main.dir/src/gtest_main.cc.o -c /usr/src/gtest/src/gtest_main.cc @@ -62,6 +70,19 @@ gtest/CMakeFiles/gtest_main.dir/src/gtest_main.cc.i: cmake_force gtest/CMakeFiles/gtest_main.dir/src/gtest_main.cc.s: cmake_force @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/gtest_main.dir/src/gtest_main.cc.s" cd /home/nomad/nomad_ws/build/gtest && /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -Wall -Wshadow -DGTEST_HAS_PTHREAD=1 -fexceptions -Wextra -S /usr/src/gtest/src/gtest_main.cc -o CMakeFiles/gtest_main.dir/src/gtest_main.cc.s +======= + $(CMAKE_COMMAND) -E cmake_progress_report /home/edison/nomad_ws/build/CMakeFiles $(CMAKE_PROGRESS_1) + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Building CXX object gtest/CMakeFiles/gtest_main.dir/src/gtest_main.cc.o" + cd /home/edison/nomad_ws/build/gtest && /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -Wall -Wshadow -DGTEST_HAS_PTHREAD=1 -fexceptions -Wextra -o CMakeFiles/gtest_main.dir/src/gtest_main.cc.o -c /usr/src/gtest/src/gtest_main.cc + +gtest/CMakeFiles/gtest_main.dir/src/gtest_main.cc.i: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/gtest_main.dir/src/gtest_main.cc.i" + cd /home/edison/nomad_ws/build/gtest && /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -Wall -Wshadow -DGTEST_HAS_PTHREAD=1 -fexceptions -Wextra -E /usr/src/gtest/src/gtest_main.cc > CMakeFiles/gtest_main.dir/src/gtest_main.cc.i + +gtest/CMakeFiles/gtest_main.dir/src/gtest_main.cc.s: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/gtest_main.dir/src/gtest_main.cc.s" + cd /home/edison/nomad_ws/build/gtest && /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -Wall -Wshadow -DGTEST_HAS_PTHREAD=1 -fexceptions -Wextra -S /usr/src/gtest/src/gtest_main.cc -o CMakeFiles/gtest_main.dir/src/gtest_main.cc.s +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 gtest/CMakeFiles/gtest_main.dir/src/gtest_main.cc.o.requires: .PHONY : gtest/CMakeFiles/gtest_main.dir/src/gtest_main.cc.o.requires @@ -84,7 +105,11 @@ gtest/libgtest_main.so: gtest/CMakeFiles/gtest_main.dir/build.make gtest/libgtest_main.so: gtest/libgtest.so gtest/libgtest_main.so: gtest/CMakeFiles/gtest_main.dir/link.txt @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --red --bold "Linking CXX shared library libgtest_main.so" +<<<<<<< HEAD cd /home/nomad/nomad_ws/build/gtest && $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/gtest_main.dir/link.txt --verbose=$(VERBOSE) +======= + cd /home/edison/nomad_ws/build/gtest && $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/gtest_main.dir/link.txt --verbose=$(VERBOSE) +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # Rule to build all files generated by this target. gtest/CMakeFiles/gtest_main.dir/build: gtest/libgtest_main.so @@ -94,10 +119,18 @@ gtest/CMakeFiles/gtest_main.dir/requires: gtest/CMakeFiles/gtest_main.dir/src/gt .PHONY : gtest/CMakeFiles/gtest_main.dir/requires gtest/CMakeFiles/gtest_main.dir/clean: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build/gtest && $(CMAKE_COMMAND) -P CMakeFiles/gtest_main.dir/cmake_clean.cmake .PHONY : gtest/CMakeFiles/gtest_main.dir/clean gtest/CMakeFiles/gtest_main.dir/depend: cd /home/nomad/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/nomad/nomad_ws/src /usr/src/gtest /home/nomad/nomad_ws/build /home/nomad/nomad_ws/build/gtest /home/nomad/nomad_ws/build/gtest/CMakeFiles/gtest_main.dir/DependInfo.cmake --color=$(COLOR) +======= + cd /home/edison/nomad_ws/build/gtest && $(CMAKE_COMMAND) -P CMakeFiles/gtest_main.dir/cmake_clean.cmake +.PHONY : gtest/CMakeFiles/gtest_main.dir/clean + +gtest/CMakeFiles/gtest_main.dir/depend: + cd /home/edison/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/edison/nomad_ws/src /usr/src/gtest /home/edison/nomad_ws/build /home/edison/nomad_ws/build/gtest /home/edison/nomad_ws/build/gtest/CMakeFiles/gtest_main.dir/DependInfo.cmake --color=$(COLOR) +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : gtest/CMakeFiles/gtest_main.dir/depend diff --git a/build/gtest/CMakeFiles/gtest_main.dir/link.txt b/build/gtest/CMakeFiles/gtest_main.dir/link.txt index 2d60d8d..2bbc3d9 100644 --- a/build/gtest/CMakeFiles/gtest_main.dir/link.txt +++ b/build/gtest/CMakeFiles/gtest_main.dir/link.txt @@ -1 +1,5 @@ +<<<<<<< HEAD /usr/bin/c++ -fPIC -shared -Wl,-soname,libgtest_main.so -o libgtest_main.so CMakeFiles/gtest_main.dir/src/gtest_main.cc.o -L/home/nomad/nomad_ws/build/gtest/src -lpthread libgtest.so -lpthread -Wl,-rpath,/home/nomad/nomad_ws/build/gtest/src:/home/nomad/nomad_ws/build/gtest +======= +/usr/bin/c++ -fPIC -shared -Wl,-soname,libgtest_main.so -o libgtest_main.so CMakeFiles/gtest_main.dir/src/gtest_main.cc.o -L/home/edison/nomad_ws/build/gtest/src -lpthread libgtest.so -lpthread -Wl,-rpath,/home/edison/nomad_ws/build/gtest/src:/home/edison/nomad_ws/build/gtest +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 diff --git a/build/gtest/CTestTestfile.cmake b/build/gtest/CTestTestfile.cmake index 092904f..a664713 100644 --- a/build/gtest/CTestTestfile.cmake +++ b/build/gtest/CTestTestfile.cmake @@ -1,6 +1,10 @@ # CMake generated Testfile for # Source directory: /usr/src/gtest +<<<<<<< HEAD # Build directory: /home/nomad/nomad_ws/build/gtest +======= +# Build directory: /home/edison/nomad_ws/build/gtest +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # # This file includes the relevent testing commands required for # testing this directory and lists subdirectories to be tested as well. diff --git a/build/gtest/Makefile b/build/gtest/Makefile index 51e6275..5510dc2 100644 --- a/build/gtest/Makefile +++ b/build/gtest/Makefile @@ -39,10 +39,17 @@ RM = /usr/bin/cmake -E remove -f EQUALS = = # The top-level source directory on which CMake was run. +<<<<<<< HEAD CMAKE_SOURCE_DIR = /home/nomad/nomad_ws/src # The top-level build directory on which CMake was run. CMAKE_BINARY_DIR = /home/nomad/nomad_ws/build +======= +CMAKE_SOURCE_DIR = /home/edison/nomad_ws/src + +# The top-level build directory on which CMake was run. +CMAKE_BINARY_DIR = /home/edison/nomad_ws/build +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 #============================================================================= # Targets provided globally by CMake. @@ -120,14 +127,24 @@ test/fast: test # The main all target all: cmake_check_build_system +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles /home/nomad/nomad_ws/build/gtest/CMakeFiles/progress.marks cd /home/nomad/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 gtest/all $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles 0 +======= + cd /home/edison/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles /home/edison/nomad_ws/build/gtest/CMakeFiles/progress.marks + cd /home/edison/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 gtest/all + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 0 +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : all # The main clean target clean: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 gtest/clean +======= + cd /home/edison/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 gtest/clean +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : clean # The main clean target @@ -136,22 +153,38 @@ clean/fast: clean # Prepare targets for installation. preinstall: all +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 gtest/preinstall +======= + cd /home/edison/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 gtest/preinstall +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : preinstall # Prepare targets for installation. preinstall/fast: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 gtest/preinstall +======= + cd /home/edison/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 gtest/preinstall +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : preinstall/fast # clear depends depend: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 +======= + cd /home/edison/nomad_ws/build && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : depend # Convenience name for target. gtest/CMakeFiles/gtest.dir/rule: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 gtest/CMakeFiles/gtest.dir/rule +======= + cd /home/edison/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 gtest/CMakeFiles/gtest.dir/rule +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : gtest/CMakeFiles/gtest.dir/rule # Convenience name for target. @@ -160,12 +193,20 @@ gtest: gtest/CMakeFiles/gtest.dir/rule # fast build rule for target. gtest/fast: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(MAKE) -f gtest/CMakeFiles/gtest.dir/build.make gtest/CMakeFiles/gtest.dir/build +======= + cd /home/edison/nomad_ws/build && $(MAKE) -f gtest/CMakeFiles/gtest.dir/build.make gtest/CMakeFiles/gtest.dir/build +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : gtest/fast # Convenience name for target. gtest/CMakeFiles/gtest_main.dir/rule: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 gtest/CMakeFiles/gtest_main.dir/rule +======= + cd /home/edison/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 gtest/CMakeFiles/gtest_main.dir/rule +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : gtest/CMakeFiles/gtest_main.dir/rule # Convenience name for target. @@ -174,7 +215,11 @@ gtest_main: gtest/CMakeFiles/gtest_main.dir/rule # fast build rule for target. gtest_main/fast: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(MAKE) -f gtest/CMakeFiles/gtest_main.dir/build.make gtest/CMakeFiles/gtest_main.dir/build +======= + cd /home/edison/nomad_ws/build && $(MAKE) -f gtest/CMakeFiles/gtest_main.dir/build.make gtest/CMakeFiles/gtest_main.dir/build +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : gtest_main/fast src/gtest-all.o: src/gtest-all.cc.o @@ -182,7 +227,11 @@ src/gtest-all.o: src/gtest-all.cc.o # target to build an object file src/gtest-all.cc.o: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(MAKE) -f gtest/CMakeFiles/gtest.dir/build.make gtest/CMakeFiles/gtest.dir/src/gtest-all.cc.o +======= + cd /home/edison/nomad_ws/build && $(MAKE) -f gtest/CMakeFiles/gtest.dir/build.make gtest/CMakeFiles/gtest.dir/src/gtest-all.cc.o +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : src/gtest-all.cc.o src/gtest-all.i: src/gtest-all.cc.i @@ -190,7 +239,11 @@ src/gtest-all.i: src/gtest-all.cc.i # target to preprocess a source file src/gtest-all.cc.i: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(MAKE) -f gtest/CMakeFiles/gtest.dir/build.make gtest/CMakeFiles/gtest.dir/src/gtest-all.cc.i +======= + cd /home/edison/nomad_ws/build && $(MAKE) -f gtest/CMakeFiles/gtest.dir/build.make gtest/CMakeFiles/gtest.dir/src/gtest-all.cc.i +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : src/gtest-all.cc.i src/gtest-all.s: src/gtest-all.cc.s @@ -198,7 +251,11 @@ src/gtest-all.s: src/gtest-all.cc.s # target to generate assembly for a file src/gtest-all.cc.s: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(MAKE) -f gtest/CMakeFiles/gtest.dir/build.make gtest/CMakeFiles/gtest.dir/src/gtest-all.cc.s +======= + cd /home/edison/nomad_ws/build && $(MAKE) -f gtest/CMakeFiles/gtest.dir/build.make gtest/CMakeFiles/gtest.dir/src/gtest-all.cc.s +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : src/gtest-all.cc.s src/gtest_main.o: src/gtest_main.cc.o @@ -206,7 +263,11 @@ src/gtest_main.o: src/gtest_main.cc.o # target to build an object file src/gtest_main.cc.o: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(MAKE) -f gtest/CMakeFiles/gtest_main.dir/build.make gtest/CMakeFiles/gtest_main.dir/src/gtest_main.cc.o +======= + cd /home/edison/nomad_ws/build && $(MAKE) -f gtest/CMakeFiles/gtest_main.dir/build.make gtest/CMakeFiles/gtest_main.dir/src/gtest_main.cc.o +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : src/gtest_main.cc.o src/gtest_main.i: src/gtest_main.cc.i @@ -214,7 +275,11 @@ src/gtest_main.i: src/gtest_main.cc.i # target to preprocess a source file src/gtest_main.cc.i: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(MAKE) -f gtest/CMakeFiles/gtest_main.dir/build.make gtest/CMakeFiles/gtest_main.dir/src/gtest_main.cc.i +======= + cd /home/edison/nomad_ws/build && $(MAKE) -f gtest/CMakeFiles/gtest_main.dir/build.make gtest/CMakeFiles/gtest_main.dir/src/gtest_main.cc.i +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : src/gtest_main.cc.i src/gtest_main.s: src/gtest_main.cc.s @@ -222,7 +287,11 @@ src/gtest_main.s: src/gtest_main.cc.s # target to generate assembly for a file src/gtest_main.cc.s: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(MAKE) -f gtest/CMakeFiles/gtest_main.dir/build.make gtest/CMakeFiles/gtest_main.dir/src/gtest_main.cc.s +======= + cd /home/edison/nomad_ws/build && $(MAKE) -f gtest/CMakeFiles/gtest_main.dir/build.make gtest/CMakeFiles/gtest_main.dir/src/gtest_main.cc.s +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : src/gtest_main.cc.s # Help Target @@ -257,6 +326,10 @@ help: # No rule that depends on this can have commands that come from listfiles # because they might be regenerated. cmake_check_build_system: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 +======= + cd /home/edison/nomad_ws/build && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : cmake_check_build_system diff --git a/build/gtest/cmake_install.cmake b/build/gtest/cmake_install.cmake index f5562a8..93ca922 100644 --- a/build/gtest/cmake_install.cmake +++ b/build/gtest/cmake_install.cmake @@ -2,7 +2,11 @@ # Set the install prefix IF(NOT DEFINED CMAKE_INSTALL_PREFIX) +<<<<<<< HEAD SET(CMAKE_INSTALL_PREFIX "/home/nomad/nomad_ws/install") +======= + SET(CMAKE_INSTALL_PREFIX "/home/edison/nomad_ws/install") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") diff --git a/build/nomad/CMakeFiles/CMakeDirectoryInformation.cmake b/build/nomad/CMakeFiles/CMakeDirectoryInformation.cmake index cf6f306..422160a 100644 --- a/build/nomad/CMakeFiles/CMakeDirectoryInformation.cmake +++ b/build/nomad/CMakeFiles/CMakeDirectoryInformation.cmake @@ -2,8 +2,13 @@ # Generated by "Unix Makefiles" Generator, CMake Version 2.8 # Relative path conversion top directories. +<<<<<<< HEAD SET(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/nomad/nomad_ws/src") SET(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/nomad/nomad_ws/build") +======= +SET(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/edison/nomad_ws/src") +SET(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/edison/nomad_ws/build") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # Force unix paths in dependencies. SET(CMAKE_FORCE_UNIX_PATHS 1) diff --git a/build/nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/DependInfo.cmake b/build/nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/DependInfo.cmake index a8d7d68..82a02c1 100644 --- a/build/nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/DependInfo.cmake +++ b/build/nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/DependInfo.cmake @@ -6,8 +6,11 @@ SET(CMAKE_DEPENDS_LANGUAGES # Preprocessor definitions for this target. SET(CMAKE_TARGET_DEFINITIONS "ROS_BUILD_SHARED_LIBS=1" +<<<<<<< HEAD "ROS_PACKAGE_NAME=\"nomad\"" "ROSCONSOLE_BACKEND_LOG4CXX" +======= +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ) # Targets to which this target links. @@ -16,7 +19,11 @@ SET(CMAKE_TARGET_LINKED_INFO_FILES # The include file search paths: SET(CMAKE_C_TARGET_INCLUDE_PATH +<<<<<<< HEAD "/opt/ros/indigo/include" +======= + "/opt/ros/jade/include" +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ) SET(CMAKE_CXX_TARGET_INCLUDE_PATH ${CMAKE_C_TARGET_INCLUDE_PATH}) SET(CMAKE_Fortran_TARGET_INCLUDE_PATH ${CMAKE_C_TARGET_INCLUDE_PATH}) diff --git a/build/nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/build.make b/build/nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/build.make index ebf7d6c..df82e6f 100644 --- a/build/nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/build.make +++ b/build/nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/build.make @@ -35,10 +35,17 @@ RM = /usr/bin/cmake -E remove -f EQUALS = = # The top-level source directory on which CMake was run. +<<<<<<< HEAD CMAKE_SOURCE_DIR = /home/nomad/nomad_ws/src # The top-level build directory on which CMake was run. CMAKE_BINARY_DIR = /home/nomad/nomad_ws/build +======= +CMAKE_SOURCE_DIR = /home/edison/nomad_ws/src + +# The top-level build directory on which CMake was run. +CMAKE_BINARY_DIR = /home/edison/nomad_ws/build +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # Utility rule file for std_msgs_generate_messages_cpp. @@ -56,10 +63,18 @@ nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/build: std_msgs_generate_mes .PHONY : nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/build nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/clean: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build/nomad && $(CMAKE_COMMAND) -P CMakeFiles/std_msgs_generate_messages_cpp.dir/cmake_clean.cmake .PHONY : nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/clean nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/depend: cd /home/nomad/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/nomad/nomad_ws/src /home/nomad/nomad_ws/src/nomad /home/nomad/nomad_ws/build /home/nomad/nomad_ws/build/nomad /home/nomad/nomad_ws/build/nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/DependInfo.cmake --color=$(COLOR) +======= + cd /home/edison/nomad_ws/build/nomad && $(CMAKE_COMMAND) -P CMakeFiles/std_msgs_generate_messages_cpp.dir/cmake_clean.cmake +.PHONY : nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/clean + +nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/depend: + cd /home/edison/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/edison/nomad_ws/src /home/edison/nomad_ws/src/nomad /home/edison/nomad_ws/build /home/edison/nomad_ws/build/nomad /home/edison/nomad_ws/build/nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/DependInfo.cmake --color=$(COLOR) +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/depend diff --git a/build/nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/DependInfo.cmake b/build/nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/DependInfo.cmake new file mode 100644 index 0000000..5125082 --- /dev/null +++ b/build/nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/DependInfo.cmake @@ -0,0 +1,21 @@ +# The set of languages for which implicit dependencies are needed: +SET(CMAKE_DEPENDS_LANGUAGES + ) +# The set of files for implicit dependencies of each language: + +# Preprocessor definitions for this target. +SET(CMAKE_TARGET_DEFINITIONS + "ROS_BUILD_SHARED_LIBS=1" + ) + +# Targets to which this target links. +SET(CMAKE_TARGET_LINKED_INFO_FILES + ) + +# The include file search paths: +SET(CMAKE_C_TARGET_INCLUDE_PATH + "/opt/ros/jade/include" + ) +SET(CMAKE_CXX_TARGET_INCLUDE_PATH ${CMAKE_C_TARGET_INCLUDE_PATH}) +SET(CMAKE_Fortran_TARGET_INCLUDE_PATH ${CMAKE_C_TARGET_INCLUDE_PATH}) +SET(CMAKE_ASM_TARGET_INCLUDE_PATH ${CMAKE_C_TARGET_INCLUDE_PATH}) diff --git a/build/nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/build.make b/build/nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/build.make new file mode 100644 index 0000000..ef926e4 --- /dev/null +++ b/build/nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/build.make @@ -0,0 +1,65 @@ +# CMAKE generated file: DO NOT EDIT! +# Generated by "Unix Makefiles" Generator, CMake Version 2.8 + +#============================================================================= +# Special targets provided by cmake. + +# Disable implicit rules so canonical targets will work. +.SUFFIXES: + +# Remove some rules from gmake that .SUFFIXES does not remove. +SUFFIXES = + +.SUFFIXES: .hpux_make_needs_suffix_list + +# Suppress display of executed commands. +$(VERBOSE).SILENT: + +# A target that is always out of date. +cmake_force: +.PHONY : cmake_force + +#============================================================================= +# Set environment variables for the build. + +# The shell in which to execute make rules. +SHELL = /bin/sh + +# The CMake executable. +CMAKE_COMMAND = /usr/bin/cmake + +# The command to remove a file. +RM = /usr/bin/cmake -E remove -f + +# Escaping for special characters. +EQUALS = = + +# The top-level source directory on which CMake was run. +CMAKE_SOURCE_DIR = /home/edison/nomad_ws/src + +# The top-level build directory on which CMake was run. +CMAKE_BINARY_DIR = /home/edison/nomad_ws/build + +# Utility rule file for std_msgs_generate_messages_eus. + +# Include the progress variables for this target. +include nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/progress.make + +nomad/CMakeFiles/std_msgs_generate_messages_eus: + +std_msgs_generate_messages_eus: nomad/CMakeFiles/std_msgs_generate_messages_eus +std_msgs_generate_messages_eus: nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/build.make +.PHONY : std_msgs_generate_messages_eus + +# Rule to build all files generated by this target. +nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/build: std_msgs_generate_messages_eus +.PHONY : nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/build + +nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/clean: + cd /home/edison/nomad_ws/build/nomad && $(CMAKE_COMMAND) -P CMakeFiles/std_msgs_generate_messages_eus.dir/cmake_clean.cmake +.PHONY : nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/clean + +nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/depend: + cd /home/edison/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/edison/nomad_ws/src /home/edison/nomad_ws/src/nomad /home/edison/nomad_ws/build /home/edison/nomad_ws/build/nomad /home/edison/nomad_ws/build/nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/DependInfo.cmake --color=$(COLOR) +.PHONY : nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/depend + diff --git a/build/nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/cmake_clean.cmake b/build/nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/cmake_clean.cmake new file mode 100644 index 0000000..206c0c3 --- /dev/null +++ b/build/nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/cmake_clean.cmake @@ -0,0 +1,8 @@ +FILE(REMOVE_RECURSE + "CMakeFiles/std_msgs_generate_messages_eus" +) + +# Per-language clean rules from dependency scanning. +FOREACH(lang) + INCLUDE(CMakeFiles/std_msgs_generate_messages_eus.dir/cmake_clean_${lang}.cmake OPTIONAL) +ENDFOREACH(lang) diff --git a/build/nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/progress.make b/build/nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/progress.make new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/build/nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/progress.make @@ -0,0 +1 @@ + diff --git a/build/nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/DependInfo.cmake b/build/nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/DependInfo.cmake index a8d7d68..82a02c1 100644 --- a/build/nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/DependInfo.cmake +++ b/build/nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/DependInfo.cmake @@ -6,8 +6,11 @@ SET(CMAKE_DEPENDS_LANGUAGES # Preprocessor definitions for this target. SET(CMAKE_TARGET_DEFINITIONS "ROS_BUILD_SHARED_LIBS=1" +<<<<<<< HEAD "ROS_PACKAGE_NAME=\"nomad\"" "ROSCONSOLE_BACKEND_LOG4CXX" +======= +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ) # Targets to which this target links. @@ -16,7 +19,11 @@ SET(CMAKE_TARGET_LINKED_INFO_FILES # The include file search paths: SET(CMAKE_C_TARGET_INCLUDE_PATH +<<<<<<< HEAD "/opt/ros/indigo/include" +======= + "/opt/ros/jade/include" +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ) SET(CMAKE_CXX_TARGET_INCLUDE_PATH ${CMAKE_C_TARGET_INCLUDE_PATH}) SET(CMAKE_Fortran_TARGET_INCLUDE_PATH ${CMAKE_C_TARGET_INCLUDE_PATH}) diff --git a/build/nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/build.make b/build/nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/build.make index 874c0d3..82b8d02 100644 --- a/build/nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/build.make +++ b/build/nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/build.make @@ -35,10 +35,17 @@ RM = /usr/bin/cmake -E remove -f EQUALS = = # The top-level source directory on which CMake was run. +<<<<<<< HEAD CMAKE_SOURCE_DIR = /home/nomad/nomad_ws/src # The top-level build directory on which CMake was run. CMAKE_BINARY_DIR = /home/nomad/nomad_ws/build +======= +CMAKE_SOURCE_DIR = /home/edison/nomad_ws/src + +# The top-level build directory on which CMake was run. +CMAKE_BINARY_DIR = /home/edison/nomad_ws/build +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # Utility rule file for std_msgs_generate_messages_lisp. @@ -56,10 +63,18 @@ nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/build: std_msgs_generate_me .PHONY : nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/build nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/clean: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build/nomad && $(CMAKE_COMMAND) -P CMakeFiles/std_msgs_generate_messages_lisp.dir/cmake_clean.cmake .PHONY : nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/clean nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/depend: cd /home/nomad/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/nomad/nomad_ws/src /home/nomad/nomad_ws/src/nomad /home/nomad/nomad_ws/build /home/nomad/nomad_ws/build/nomad /home/nomad/nomad_ws/build/nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/DependInfo.cmake --color=$(COLOR) +======= + cd /home/edison/nomad_ws/build/nomad && $(CMAKE_COMMAND) -P CMakeFiles/std_msgs_generate_messages_lisp.dir/cmake_clean.cmake +.PHONY : nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/clean + +nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/depend: + cd /home/edison/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/edison/nomad_ws/src /home/edison/nomad_ws/src/nomad /home/edison/nomad_ws/build /home/edison/nomad_ws/build/nomad /home/edison/nomad_ws/build/nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/DependInfo.cmake --color=$(COLOR) +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/depend diff --git a/build/nomad/CMakeFiles/std_msgs_generate_messages_py.dir/DependInfo.cmake b/build/nomad/CMakeFiles/std_msgs_generate_messages_py.dir/DependInfo.cmake index a8d7d68..82a02c1 100644 --- a/build/nomad/CMakeFiles/std_msgs_generate_messages_py.dir/DependInfo.cmake +++ b/build/nomad/CMakeFiles/std_msgs_generate_messages_py.dir/DependInfo.cmake @@ -6,8 +6,11 @@ SET(CMAKE_DEPENDS_LANGUAGES # Preprocessor definitions for this target. SET(CMAKE_TARGET_DEFINITIONS "ROS_BUILD_SHARED_LIBS=1" +<<<<<<< HEAD "ROS_PACKAGE_NAME=\"nomad\"" "ROSCONSOLE_BACKEND_LOG4CXX" +======= +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ) # Targets to which this target links. @@ -16,7 +19,11 @@ SET(CMAKE_TARGET_LINKED_INFO_FILES # The include file search paths: SET(CMAKE_C_TARGET_INCLUDE_PATH +<<<<<<< HEAD "/opt/ros/indigo/include" +======= + "/opt/ros/jade/include" +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ) SET(CMAKE_CXX_TARGET_INCLUDE_PATH ${CMAKE_C_TARGET_INCLUDE_PATH}) SET(CMAKE_Fortran_TARGET_INCLUDE_PATH ${CMAKE_C_TARGET_INCLUDE_PATH}) diff --git a/build/nomad/CMakeFiles/std_msgs_generate_messages_py.dir/build.make b/build/nomad/CMakeFiles/std_msgs_generate_messages_py.dir/build.make index f9d231c..95c490c 100644 --- a/build/nomad/CMakeFiles/std_msgs_generate_messages_py.dir/build.make +++ b/build/nomad/CMakeFiles/std_msgs_generate_messages_py.dir/build.make @@ -35,10 +35,17 @@ RM = /usr/bin/cmake -E remove -f EQUALS = = # The top-level source directory on which CMake was run. +<<<<<<< HEAD CMAKE_SOURCE_DIR = /home/nomad/nomad_ws/src # The top-level build directory on which CMake was run. CMAKE_BINARY_DIR = /home/nomad/nomad_ws/build +======= +CMAKE_SOURCE_DIR = /home/edison/nomad_ws/src + +# The top-level build directory on which CMake was run. +CMAKE_BINARY_DIR = /home/edison/nomad_ws/build +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # Utility rule file for std_msgs_generate_messages_py. @@ -56,10 +63,18 @@ nomad/CMakeFiles/std_msgs_generate_messages_py.dir/build: std_msgs_generate_mess .PHONY : nomad/CMakeFiles/std_msgs_generate_messages_py.dir/build nomad/CMakeFiles/std_msgs_generate_messages_py.dir/clean: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build/nomad && $(CMAKE_COMMAND) -P CMakeFiles/std_msgs_generate_messages_py.dir/cmake_clean.cmake .PHONY : nomad/CMakeFiles/std_msgs_generate_messages_py.dir/clean nomad/CMakeFiles/std_msgs_generate_messages_py.dir/depend: cd /home/nomad/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/nomad/nomad_ws/src /home/nomad/nomad_ws/src/nomad /home/nomad/nomad_ws/build /home/nomad/nomad_ws/build/nomad /home/nomad/nomad_ws/build/nomad/CMakeFiles/std_msgs_generate_messages_py.dir/DependInfo.cmake --color=$(COLOR) +======= + cd /home/edison/nomad_ws/build/nomad && $(CMAKE_COMMAND) -P CMakeFiles/std_msgs_generate_messages_py.dir/cmake_clean.cmake +.PHONY : nomad/CMakeFiles/std_msgs_generate_messages_py.dir/clean + +nomad/CMakeFiles/std_msgs_generate_messages_py.dir/depend: + cd /home/edison/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/edison/nomad_ws/src /home/edison/nomad_ws/src/nomad /home/edison/nomad_ws/build /home/edison/nomad_ws/build/nomad /home/edison/nomad_ws/build/nomad/CMakeFiles/std_msgs_generate_messages_py.dir/DependInfo.cmake --color=$(COLOR) +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : nomad/CMakeFiles/std_msgs_generate_messages_py.dir/depend diff --git a/build/nomad/CTestTestfile.cmake b/build/nomad/CTestTestfile.cmake index 280d329..d8d8351 100644 --- a/build/nomad/CTestTestfile.cmake +++ b/build/nomad/CTestTestfile.cmake @@ -1,6 +1,11 @@ # CMake generated Testfile for +<<<<<<< HEAD # Source directory: /home/nomad/nomad_ws/src/nomad # Build directory: /home/nomad/nomad_ws/build/nomad +======= +# Source directory: /home/edison/nomad_ws/src/nomad +# Build directory: /home/edison/nomad_ws/build/nomad +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # # This file includes the relevent testing commands required for # testing this directory and lists subdirectories to be tested as well. diff --git a/build/nomad/Makefile b/build/nomad/Makefile index f68540d..779c7ef 100644 --- a/build/nomad/Makefile +++ b/build/nomad/Makefile @@ -39,10 +39,17 @@ RM = /usr/bin/cmake -E remove -f EQUALS = = # The top-level source directory on which CMake was run. +<<<<<<< HEAD CMAKE_SOURCE_DIR = /home/nomad/nomad_ws/src # The top-level build directory on which CMake was run. CMAKE_BINARY_DIR = /home/nomad/nomad_ws/build +======= +CMAKE_SOURCE_DIR = /home/edison/nomad_ws/src + +# The top-level build directory on which CMake was run. +CMAKE_BINARY_DIR = /home/edison/nomad_ws/build +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 #============================================================================= # Targets provided globally by CMake. @@ -120,14 +127,24 @@ test/fast: test # The main all target all: cmake_check_build_system +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles /home/nomad/nomad_ws/build/nomad/CMakeFiles/progress.marks cd /home/nomad/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 nomad/all $(CMAKE_COMMAND) -E cmake_progress_start /home/nomad/nomad_ws/build/CMakeFiles 0 +======= + cd /home/edison/nomad_ws/build && $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles /home/edison/nomad_ws/build/nomad/CMakeFiles/progress.marks + cd /home/edison/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 nomad/all + $(CMAKE_COMMAND) -E cmake_progress_start /home/edison/nomad_ws/build/CMakeFiles 0 +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : all # The main clean target clean: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 nomad/clean +======= + cd /home/edison/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 nomad/clean +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : clean # The main clean target @@ -136,16 +153,25 @@ clean/fast: clean # Prepare targets for installation. preinstall: all +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 nomad/preinstall +======= + cd /home/edison/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 nomad/preinstall +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : preinstall # Prepare targets for installation. preinstall/fast: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 nomad/preinstall +======= + cd /home/edison/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 nomad/preinstall +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : preinstall/fast # clear depends depend: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 .PHONY : depend @@ -236,6 +262,14 @@ rosgraph_msgs_generate_messages_py/fast: # Convenience name for target. nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/rule: cd /home/nomad/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/rule +======= + cd /home/edison/nomad_ws/build && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 +.PHONY : depend + +# Convenience name for target. +nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/rule: + cd /home/edison/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/rule +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/rule # Convenience name for target. @@ -244,12 +278,35 @@ std_msgs_generate_messages_cpp: nomad/CMakeFiles/std_msgs_generate_messages_cpp. # fast build rule for target. std_msgs_generate_messages_cpp/fast: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(MAKE) -f nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/build.make nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/build .PHONY : std_msgs_generate_messages_cpp/fast # Convenience name for target. nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/rule: cd /home/nomad/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/rule +======= + cd /home/edison/nomad_ws/build && $(MAKE) -f nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/build.make nomad/CMakeFiles/std_msgs_generate_messages_cpp.dir/build +.PHONY : std_msgs_generate_messages_cpp/fast + +# Convenience name for target. +nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/rule: + cd /home/edison/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/rule +.PHONY : nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/rule + +# Convenience name for target. +std_msgs_generate_messages_eus: nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/rule +.PHONY : std_msgs_generate_messages_eus + +# fast build rule for target. +std_msgs_generate_messages_eus/fast: + cd /home/edison/nomad_ws/build && $(MAKE) -f nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/build.make nomad/CMakeFiles/std_msgs_generate_messages_eus.dir/build +.PHONY : std_msgs_generate_messages_eus/fast + +# Convenience name for target. +nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/rule: + cd /home/edison/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/rule +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/rule # Convenience name for target. @@ -258,12 +315,20 @@ std_msgs_generate_messages_lisp: nomad/CMakeFiles/std_msgs_generate_messages_lis # fast build rule for target. std_msgs_generate_messages_lisp/fast: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(MAKE) -f nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/build.make nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/build +======= + cd /home/edison/nomad_ws/build && $(MAKE) -f nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/build.make nomad/CMakeFiles/std_msgs_generate_messages_lisp.dir/build +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : std_msgs_generate_messages_lisp/fast # Convenience name for target. nomad/CMakeFiles/std_msgs_generate_messages_py.dir/rule: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 nomad/CMakeFiles/std_msgs_generate_messages_py.dir/rule +======= + cd /home/edison/nomad_ws/build && $(MAKE) -f CMakeFiles/Makefile2 nomad/CMakeFiles/std_msgs_generate_messages_py.dir/rule +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : nomad/CMakeFiles/std_msgs_generate_messages_py.dir/rule # Convenience name for target. @@ -272,7 +337,11 @@ std_msgs_generate_messages_py: nomad/CMakeFiles/std_msgs_generate_messages_py.di # fast build rule for target. std_msgs_generate_messages_py/fast: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(MAKE) -f nomad/CMakeFiles/std_msgs_generate_messages_py.dir/build.make nomad/CMakeFiles/std_msgs_generate_messages_py.dir/build +======= + cd /home/edison/nomad_ws/build && $(MAKE) -f nomad/CMakeFiles/std_msgs_generate_messages_py.dir/build.make nomad/CMakeFiles/std_msgs_generate_messages_py.dir/build +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : std_msgs_generate_messages_py/fast # Help Target @@ -287,6 +356,7 @@ help: @echo "... install/strip" @echo "... list_install_components" @echo "... rebuild_cache" +<<<<<<< HEAD @echo "... roscpp_generate_messages_cpp" @echo "... roscpp_generate_messages_lisp" @echo "... roscpp_generate_messages_py" @@ -294,6 +364,10 @@ help: @echo "... rosgraph_msgs_generate_messages_lisp" @echo "... rosgraph_msgs_generate_messages_py" @echo "... std_msgs_generate_messages_cpp" +======= + @echo "... std_msgs_generate_messages_cpp" + @echo "... std_msgs_generate_messages_eus" +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 @echo "... std_msgs_generate_messages_lisp" @echo "... std_msgs_generate_messages_py" @echo "... test" @@ -308,6 +382,10 @@ help: # No rule that depends on this can have commands that come from listfiles # because they might be regenerated. cmake_check_build_system: +<<<<<<< HEAD cd /home/nomad/nomad_ws/build && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 +======= + cd /home/edison/nomad_ws/build && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 .PHONY : cmake_check_build_system diff --git a/build/nomad/catkin_generated/installspace/nomad.pc b/build/nomad/catkin_generated/installspace/nomad.pc index 2fb4693..2695080 100644 --- a/build/nomad/catkin_generated/installspace/nomad.pc +++ b/build/nomad/catkin_generated/installspace/nomad.pc @@ -1,8 +1,16 @@ +<<<<<<< HEAD prefix=/home/nomad/nomad_ws/install +======= +prefix=/home/edison/nomad_ws/install +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 Name: nomad Description: Description of nomad Version: 0.0.0 Cflags: +<<<<<<< HEAD Libs: -L/home/nomad/nomad_ws/install/lib +======= +Libs: -L/home/edison/nomad_ws/install/lib +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 Requires: diff --git a/build/nomad/catkin_generated/installspace/nomadConfig.cmake b/build/nomad/catkin_generated/installspace/nomadConfig.cmake index 87bb293..d37d456 100644 --- a/build/nomad/catkin_generated/installspace/nomadConfig.cmake +++ b/build/nomad/catkin_generated/installspace/nomadConfig.cmake @@ -67,14 +67,23 @@ set(nomad_CONFIG_INCLUDED TRUE) # set variables for source/devel/install prefixes if("FALSE" STREQUAL "TRUE") +<<<<<<< HEAD set(nomad_SOURCE_PREFIX /home/nomad/nomad_ws/src/nomad) set(nomad_DEVEL_PREFIX /home/nomad/nomad_ws/devel) +======= + set(nomad_SOURCE_PREFIX /home/edison/nomad_ws/src/nomad) + set(nomad_DEVEL_PREFIX /home/edison/nomad_ws/devel) +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 set(nomad_INSTALL_PREFIX "") set(nomad_PREFIX ${nomad_DEVEL_PREFIX}) else() set(nomad_SOURCE_PREFIX "") set(nomad_DEVEL_PREFIX "") +<<<<<<< HEAD set(nomad_INSTALL_PREFIX /home/nomad/nomad_ws/install) +======= + set(nomad_INSTALL_PREFIX /home/edison/nomad_ws/install) +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 set(nomad_PREFIX ${nomad_INSTALL_PREFIX}) endif() @@ -100,10 +109,17 @@ if(NOT " " STREQUAL " ") elseif("${idir} " STREQUAL "include ") get_filename_component(include "${nomad_DIR}/../../../include" ABSOLUTE) if(NOT IS_DIRECTORY ${include}) +<<<<<<< HEAD message(FATAL_ERROR "Project 'nomad' specifies '${idir}' as an include dir, which is not found. It does not exist in '${include}'. Ask the maintainer 'nomad ' to fix it.") endif() else() message(FATAL_ERROR "Project 'nomad' specifies '${idir}' as an include dir, which is not found. It does neither exist as an absolute directory nor in '/home/nomad/nomad_ws/install/${idir}'. Ask the maintainer 'nomad ' to fix it.") +======= + message(FATAL_ERROR "Project 'nomad' specifies '${idir}' as an include dir, which is not found. It does not exist in '${include}'. Ask the maintainer 'edison ' to fix it.") + endif() + else() + message(FATAL_ERROR "Project 'nomad' specifies '${idir}' as an include dir, which is not found. It does neither exist as an absolute directory nor in '/home/edison/nomad_ws/install/${idir}'. Ask the maintainer 'edison ' to fix it.") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 endif() _list_append_unique(nomad_INCLUDE_DIRS ${include}) endforeach() @@ -122,7 +138,11 @@ foreach(library ${libraries}) set(lib_path "") set(lib "${library}-NOTFOUND") # since the path where the library is found is returned we have to iterate over the paths manually +<<<<<<< HEAD foreach(path /home/nomad/nomad_ws/install/lib;/home/nomad/nomad_ws/devel/lib;/opt/ros/indigo/lib) +======= + foreach(path /home/edison/nomad_ws/install/lib;/home/edison/nomad_ws/devel/lib;/opt/ros/jade/lib) +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 find_library(lib ${library} PATHS ${path} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) diff --git a/build/nomad/catkin_generated/ordered_paths.cmake b/build/nomad/catkin_generated/ordered_paths.cmake index 22f3651..f3761ac 100644 --- a/build/nomad/catkin_generated/ordered_paths.cmake +++ b/build/nomad/catkin_generated/ordered_paths.cmake @@ -1 +1,5 @@ -set(ORDERED_PATHS "/opt/ros/indigo/lib") \ No newline at end of file +<<<<<<< HEAD +set(ORDERED_PATHS "/opt/ros/indigo/lib") +======= +set(ORDERED_PATHS "/opt/ros/jade/lib") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 diff --git a/build/nomad/catkin_generated/package.cmake b/build/nomad/catkin_generated/package.cmake index 8c70b71..c988b8c 100644 --- a/build/nomad/catkin_generated/package.cmake +++ b/build/nomad/catkin_generated/package.cmake @@ -1,7 +1,15 @@ set(_CATKIN_CURRENT_PACKAGE "nomad") +<<<<<<< HEAD set(nomad_MAINTAINER "nomad ") set(nomad_DEPRECATED "") set(nomad_VERSION "0.0.0") set(nomad_BUILD_DEPENDS "roscpp" "rospy" "std_msgs") set(nomad_RUN_DEPENDS "roscpp" "rospy" "std_msgs") +======= +set(nomad_MAINTAINER "edison ") +set(nomad_DEPRECATED "") +set(nomad_VERSION "0.0.0") +set(nomad_BUILD_DEPENDS "rospy" "std.msgs") +set(nomad_RUN_DEPENDS "rospy" "std.msgs") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 set(nomad_BUILDTOOL_DEPENDS "catkin") \ No newline at end of file diff --git a/build/nomad/catkin_generated/pkg.develspace.context.pc.py b/build/nomad/catkin_generated/pkg.develspace.context.pc.py index aabddd4..b09fc34 100644 --- a/build/nomad/catkin_generated/pkg.develspace.context.pc.py +++ b/build/nomad/catkin_generated/pkg.develspace.context.pc.py @@ -4,5 +4,9 @@ PROJECT_CATKIN_DEPENDS = "".replace(';', ' ') PKG_CONFIG_LIBRARIES_WITH_PREFIX = "".split(';') if "" != "" else [] PROJECT_NAME = "nomad" +<<<<<<< HEAD PROJECT_SPACE_DIR = "/home/nomad/nomad_ws/devel" +======= +PROJECT_SPACE_DIR = "/home/edison/nomad_ws/devel" +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 PROJECT_VERSION = "0.0.0" diff --git a/build/nomad/catkin_generated/pkg.installspace.context.pc.py b/build/nomad/catkin_generated/pkg.installspace.context.pc.py index 32b86fe..79eee66 100644 --- a/build/nomad/catkin_generated/pkg.installspace.context.pc.py +++ b/build/nomad/catkin_generated/pkg.installspace.context.pc.py @@ -4,5 +4,9 @@ PROJECT_CATKIN_DEPENDS = "".replace(';', ' ') PKG_CONFIG_LIBRARIES_WITH_PREFIX = "".split(';') if "" != "" else [] PROJECT_NAME = "nomad" +<<<<<<< HEAD PROJECT_SPACE_DIR = "/home/nomad/nomad_ws/install" +======= +PROJECT_SPACE_DIR = "/home/edison/nomad_ws/install" +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 PROJECT_VERSION = "0.0.0" diff --git a/build/nomad/catkin_generated/stamps/nomad/package.xml.stamp b/build/nomad/catkin_generated/stamps/nomad/package.xml.stamp index a211045..b82ead4 100644 --- a/build/nomad/catkin_generated/stamps/nomad/package.xml.stamp +++ b/build/nomad/catkin_generated/stamps/nomad/package.xml.stamp @@ -7,13 +7,21 @@ +<<<<<<< HEAD nomad +======= + edison +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 +<<<<<<< HEAD BSD +======= + TODO +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 @@ -26,7 +34,10 @@ +<<<<<<< HEAD Jeff Cicolani +======= +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 @@ -41,12 +52,19 @@ catkin +<<<<<<< HEAD roscpp rospy std_msgs roscpp rospy std_msgs +======= + rospy + std.msgs + rospy + std.msgs +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 @@ -54,4 +72,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 diff --git a/build/nomad/cmake_install.cmake b/build/nomad/cmake_install.cmake index 109a7fe..219d97a 100644 --- a/build/nomad/cmake_install.cmake +++ b/build/nomad/cmake_install.cmake @@ -1,8 +1,16 @@ +<<<<<<< HEAD # Install script for directory: /home/nomad/nomad_ws/src/nomad # Set the install prefix IF(NOT DEFINED CMAKE_INSTALL_PREFIX) SET(CMAKE_INSTALL_PREFIX "/home/nomad/nomad_ws/install") +======= +# Install script for directory: /home/edison/nomad_ws/src/nomad + +# Set the install prefix +IF(NOT DEFINED CMAKE_INSTALL_PREFIX) + SET(CMAKE_INSTALL_PREFIX "/home/edison/nomad_ws/install") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") @@ -33,17 +41,30 @@ IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") +<<<<<<< HEAD FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig" TYPE FILE FILES "/home/nomad/nomad_ws/build/nomad/catkin_generated/installspace/nomad.pc") +======= + FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig" TYPE FILE FILES "/home/edison/nomad_ws/build/nomad/catkin_generated/installspace/nomad.pc") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/share/nomad/cmake" TYPE FILE FILES +<<<<<<< HEAD "/home/nomad/nomad_ws/build/nomad/catkin_generated/installspace/nomadConfig.cmake" "/home/nomad/nomad_ws/build/nomad/catkin_generated/installspace/nomadConfig-version.cmake" +======= + "/home/edison/nomad_ws/build/nomad/catkin_generated/installspace/nomadConfig.cmake" + "/home/edison/nomad_ws/build/nomad/catkin_generated/installspace/nomadConfig-version.cmake" +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ) ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") +<<<<<<< HEAD FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/share/nomad" TYPE FILE FILES "/home/nomad/nomad_ws/src/nomad/package.xml") +======= + FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/share/nomad" TYPE FILE FILES "/home/edison/nomad_ws/src/nomad/package.xml") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified") diff --git a/devel/.catkin b/devel/.catkin index bc89844..5965bea 100644 --- a/devel/.catkin +++ b/devel/.catkin @@ -1 +1,5 @@ -/home/nomad/nomad_ws/src \ No newline at end of file +<<<<<<< HEAD +/home/nomad/nomad_ws/src +======= +/home/edison/nomad_ws/src +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 diff --git a/devel/.rosinstall b/devel/.rosinstall index 1287edd..9f0763e 100644 --- a/devel/.rosinstall +++ b/devel/.rosinstall @@ -1,2 +1,6 @@ - setup-file: +<<<<<<< HEAD local-name: /home/nomad/nomad_ws/devel/setup.sh +======= + local-name: /home/edison/nomad_ws/devel/setup.sh +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 diff --git a/devel/_setup_util.py b/devel/_setup_util.py index 1b151be..d103985 100755 --- a/devel/_setup_util.py +++ b/devel/_setup_util.py @@ -53,9 +53,15 @@ ENV_VAR_SUBFOLDERS = { 'CMAKE_PREFIX_PATH': '', 'CPATH': 'include', +<<<<<<< HEAD 'LD_LIBRARY_PATH' if not IS_DARWIN else 'DYLD_LIBRARY_PATH': ['lib', os.path.join('lib', 'arm-linux-gnueabihf')], 'PATH': 'bin', 'PKG_CONFIG_PATH': [os.path.join('lib', 'pkgconfig'), os.path.join('lib', 'arm-linux-gnueabihf', 'pkgconfig')], +======= + 'LD_LIBRARY_PATH' if not IS_DARWIN else 'DYLD_LIBRARY_PATH': ['lib', os.path.join('lib', 'i386-linux-gnu')], + 'PATH': 'bin', + 'PKG_CONFIG_PATH': [os.path.join('lib', 'pkgconfig'), os.path.join('lib', 'i386-linux-gnu', 'pkgconfig')], +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 'PYTHONPATH': 'lib/python2.7/dist-packages', } @@ -260,7 +266,11 @@ def _parse_arguments(args=None): sys.exit(1) # environment at generation time +<<<<<<< HEAD CMAKE_PREFIX_PATH = '/home/nomad/nomad_ws/devel;/opt/ros/indigo'.split(';') +======= + CMAKE_PREFIX_PATH = '/home/edison/nomad_ws/devel;/opt/ros/jade'.split(';') +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # prepend current workspace if not already part of CPP base_path = os.path.dirname(__file__) if base_path not in CMAKE_PREFIX_PATH: diff --git a/devel/lib/pkgconfig/nomad.pc b/devel/lib/pkgconfig/nomad.pc index 1e7906b..b036f63 100644 --- a/devel/lib/pkgconfig/nomad.pc +++ b/devel/lib/pkgconfig/nomad.pc @@ -1,8 +1,16 @@ +<<<<<<< HEAD prefix=/home/nomad/nomad_ws/devel +======= +prefix=/home/edison/nomad_ws/devel +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 Name: nomad Description: Description of nomad Version: 0.0.0 Cflags: +<<<<<<< HEAD Libs: -L/home/nomad/nomad_ws/devel/lib +======= +Libs: -L/home/edison/nomad_ws/devel/lib +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 Requires: diff --git a/devel/setup.sh b/devel/setup.sh index c2b12a7..dc6bfd9 100644 --- a/devel/setup.sh +++ b/devel/setup.sh @@ -8,7 +8,11 @@ # since this file is sourced either use the provided _CATKIN_SETUP_DIR # or fall back to the destination set at configure time +<<<<<<< HEAD : ${_CATKIN_SETUP_DIR:=/home/nomad/nomad_ws/devel} +======= +: ${_CATKIN_SETUP_DIR:=/home/edison/nomad_ws/devel} +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 _SETUP_UTIL="$_CATKIN_SETUP_DIR/_setup_util.py" unset _CATKIN_SETUP_DIR diff --git a/devel/share/nomad/cmake/nomadConfig.cmake b/devel/share/nomad/cmake/nomadConfig.cmake index c159ecf..2b22f46 100644 --- a/devel/share/nomad/cmake/nomadConfig.cmake +++ b/devel/share/nomad/cmake/nomadConfig.cmake @@ -67,14 +67,23 @@ set(nomad_CONFIG_INCLUDED TRUE) # set variables for source/devel/install prefixes if("TRUE" STREQUAL "TRUE") +<<<<<<< HEAD set(nomad_SOURCE_PREFIX /home/nomad/nomad_ws/src/nomad) set(nomad_DEVEL_PREFIX /home/nomad/nomad_ws/devel) +======= + set(nomad_SOURCE_PREFIX /home/edison/nomad_ws/src/nomad) + set(nomad_DEVEL_PREFIX /home/edison/nomad_ws/devel) +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 set(nomad_INSTALL_PREFIX "") set(nomad_PREFIX ${nomad_DEVEL_PREFIX}) else() set(nomad_SOURCE_PREFIX "") set(nomad_DEVEL_PREFIX "") +<<<<<<< HEAD set(nomad_INSTALL_PREFIX /home/nomad/nomad_ws/install) +======= + set(nomad_INSTALL_PREFIX /home/edison/nomad_ws/install) +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 set(nomad_PREFIX ${nomad_INSTALL_PREFIX}) endif() @@ -100,10 +109,17 @@ if(NOT " " STREQUAL " ") elseif("${idir} " STREQUAL "include ") get_filename_component(include "${nomad_DIR}/../../../include" ABSOLUTE) if(NOT IS_DIRECTORY ${include}) +<<<<<<< HEAD message(FATAL_ERROR "Project 'nomad' specifies '${idir}' as an include dir, which is not found. It does not exist in '${include}'. Ask the maintainer 'nomad ' to fix it.") endif() else() message(FATAL_ERROR "Project 'nomad' specifies '${idir}' as an include dir, which is not found. It does neither exist as an absolute directory nor in '/home/nomad/nomad_ws/src/nomad/${idir}'. Ask the maintainer 'nomad ' to fix it.") +======= + message(FATAL_ERROR "Project 'nomad' specifies '${idir}' as an include dir, which is not found. It does not exist in '${include}'. Ask the maintainer 'edison ' to fix it.") + endif() + else() + message(FATAL_ERROR "Project 'nomad' specifies '${idir}' as an include dir, which is not found. It does neither exist as an absolute directory nor in '/home/edison/nomad_ws/src/nomad/${idir}'. Ask the maintainer 'edison ' to fix it.") +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 endif() _list_append_unique(nomad_INCLUDE_DIRS ${include}) endforeach() @@ -122,7 +138,11 @@ foreach(library ${libraries}) set(lib_path "") set(lib "${library}-NOTFOUND") # since the path where the library is found is returned we have to iterate over the paths manually +<<<<<<< HEAD foreach(path /home/nomad/nomad_ws/devel/lib;/home/nomad/nomad_ws/devel/lib;/opt/ros/indigo/lib) +======= + foreach(path /home/edison/nomad_ws/devel/lib;/home/edison/nomad_ws/devel/lib;/opt/ros/jade/lib) +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 find_library(lib ${library} PATHS ${path} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) diff --git a/src/nomad/.CMakeLists.txt.swp b/src/nomad/.CMakeLists.txt.swp new file mode 100644 index 0000000..ae3c96f Binary files /dev/null and b/src/nomad/.CMakeLists.txt.swp differ diff --git a/src/nomad/CMakeLists.txt b/src/nomad/CMakeLists.txt index e96e105..68326eb 100644 --- a/src/nomad/CMakeLists.txt +++ b/src/nomad/CMakeLists.txt @@ -1,11 +1,18 @@ +<<<<<<< HEAD cmake_minimum_required(VERSION 2.8.3) +======= +cmake_minimum_required(VERSION 1.8.3) +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 project(nomad) ## Find catkin macros and libraries ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz) ## is used, also find other catkin packages find_package(catkin REQUIRED COMPONENTS +<<<<<<< HEAD roscpp +======= +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 rospy std_msgs ) @@ -67,7 +74,11 @@ find_package(catkin REQUIRED COMPONENTS ## Generate added messages and services with any dependencies listed here # generate_messages( # DEPENDENCIES +<<<<<<< HEAD # std_msgs +======= +# std_msgs # Or other packages containing msgs +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # ) ################################################ @@ -102,7 +113,11 @@ find_package(catkin REQUIRED COMPONENTS catkin_package( # INCLUDE_DIRS include # LIBRARIES nomad +<<<<<<< HEAD # CATKIN_DEPENDS roscpp rospy std_msgs +======= +# CATKIN_DEPENDS rospy std.msgs +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 # DEPENDS system_lib ) diff --git a/src/nomad/package.xml b/src/nomad/package.xml index a211045..b82ead4 100644 --- a/src/nomad/package.xml +++ b/src/nomad/package.xml @@ -7,13 +7,21 @@ +<<<<<<< HEAD nomad +======= + edison +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 +<<<<<<< HEAD BSD +======= + TODO +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 @@ -26,7 +34,10 @@ +<<<<<<< HEAD Jeff Cicolani +======= +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 @@ -41,12 +52,19 @@ catkin +<<<<<<< HEAD roscpp rospy std_msgs roscpp rospy std_msgs +======= + rospy + std.msgs + rospy + std.msgs +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648 @@ -54,4 +72,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> c894deaf8f51fc464f792dfd76aec936b4ce0648