Permalink
Browse files

rename library ums -> motor_stepper

  • Loading branch information...
1 parent 5e9951f commit 1faa87e26afba7844373c3abbc7ed4090736cff1 @mschafer committed Aug 30, 2012
Showing with 11 additions and 11 deletions.
  1. +2 −2 host/cli/CMakeLists.txt
  2. +5 −5 host/lib/CMakeLists.txt
  3. +2 −2 host/lib/UMS_DLL.h
  4. +2 −2 host/test/CMakeLists.txt
View
@@ -17,8 +17,8 @@ install (TARGETS stepper
)
if (WIN32)
-target_link_libraries(stepper ums)
+ target_link_libraries(stepper motor_stepper)
else (WIN32)
-target_link_libraries(stepper boost_system boost_thread boost_program_options ums)
+ target_link_libraries(stepper boost_system boost_thread boost_program_options motor_stepper)
endif (WIN32)
View
@@ -11,13 +11,13 @@ include_directories ( ${Boost_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/host/lib
)
-add_library (ums SHARED
+add_library (motor_stepper SHARED
${COMMON_SRCS}
${SIM_SRCS}
${LIB_SRCS}
)
-install (TARGETS ums DESTINATION bin
+install (TARGETS motor_stepper DESTINATION bin
LIBRARY DESTINATION bin
)
@@ -29,6 +29,6 @@ install (FILES
DESTINATION include
)
-if ( NOT WIN32 )
-target_link_libraries(ums boost_system boost_thread)
-endif ( NOT WIN32)
+if (NOT WIN32)
+ target_link_libraries(motor_stepper boost_system boost_thread)
+endif (NOT WIN32)
View
@@ -1,7 +1,7 @@
#ifndef UMS_DLL_hpp
#define UMS_DLL_hpp
-/* Cmake will define ums_EXPORTS on Windows when it
+/* Cmake will define motor_stepper_EXPORTS on Windows when it
configures to build a shared library. If you are going to use
another build system on windows or create the visual studio
projects by hand you need to define ums_EXPORTS when
@@ -13,7 +13,7 @@ building a DLL on windows.
// VS will warn about every boost and std template not having dll interface w/o these
#pragma warning( disable: 4251 )
#pragma warning( disable: 4275 )
- #if defined(ums_EXPORTS)
+ #if defined(motor_stepper_EXPORTS)
#define UMS_API __declspec(dllexport)
#else
#define UMS_API __declspec(dllimport)
View
@@ -16,7 +16,7 @@ add_executable(test-usb-motor-stepper
)
if (WIN32)
-target_link_libraries(test-usb-motor-stepper ums)
+ target_link_libraries(test-usb-motor-stepper motor_stepper)
else (WIN32)
-target_link_libraries(test-usb-motor-stepper boost_unit_test_framework boost_system boost_thread ums)
+ target_link_libraries(test-usb-motor-stepper boost_unit_test_framework boost_system boost_thread motor_stepper)
endif (WIN32)

0 comments on commit 1faa87e

Please sign in to comment.