-
-
Notifications
You must be signed in to change notification settings - Fork 74
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
815ee4d
commit 75cbecd
Showing
4 changed files
with
71 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
diff --git a/cmake/compiler.cmake b/cmake/compiler.cmake | ||
index a191c80..c187bed 100644 | ||
--- a/cmake/compiler.cmake | ||
+++ b/cmake/compiler.cmake | ||
@@ -31,9 +31,9 @@ MACRO(_SETUP_PROJECT_WARNINGS) | ||
ENDIF(${R${FLAG}}) | ||
ENDFOREACH(FLAG ${FLAGS}) | ||
|
||
- IF(NOT DEFINED CXX_DISABLE_WERROR) | ||
- SET(WARNING_CXX_FLAGS "-Werror ${WARNING_CXX_FLAGS}") | ||
- ENDIF(NOT DEFINED CXX_DISABLE_WERROR) | ||
+ # IF(NOT DEFINED CXX_DISABLE_WERROR) | ||
+ # SET(WARNING_CXX_FLAGS "-Werror ${WARNING_CXX_FLAGS}") | ||
+ # ENDIF(NOT DEFINED CXX_DISABLE_WERROR) | ||
ENDIF(UNIX) | ||
|
||
# For win32 systems, it is impossible to use Wall, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index c1a1f06..8e1a908 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -141,6 +141,10 @@ IF(UNIX) | ||
TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC ${CMAKE_DL_LIBS} pthread) | ||
ENDIF(UNIX) | ||
|
||
+IF(UNIX AND NOT APPLE) | ||
+ TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC rt) | ||
+ENDIF(UNIX AND NOT APPLE) | ||
+ | ||
IF(SUFFIX_SO_VERSION) | ||
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION}) | ||
ENDIF(SUFFIX_SO_VERSION) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 4413d4d..05e602b 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -8,6 +8,9 @@ find_package(catkin REQUIRED COMPONENTS | ||
roscpp | ||
) | ||
|
||
+find_package(PkgConfig) | ||
+pkg_check_modules(LibCAP libcap) | ||
+ | ||
catkin_package( | ||
# INCLUDE_DIRS include | ||
# LIBRARIES ethercat_grant | ||
@@ -16,9 +19,10 @@ catkin_package( | ||
) | ||
include_directories( | ||
${catkin_INCLUDE_DIRS} | ||
+ ${LibCAP_INCLUDE_DIRS} | ||
) | ||
add_executable(ethercat_grant src/ethercat_grant.cpp) | ||
-target_link_libraries(ethercat_grant cap) | ||
+target_link_libraries(ethercat_grant ${LibCAP_LIBRARIES}) | ||
|
||
install(TARGETS ethercat_grant | ||
RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index b231073..3f6f176 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -33,7 +33,7 @@ find_package(yaml-cpp REQUIRED) | ||
|
||
add_custom_target( | ||
binary_driver ALL | ||
- COMMAND cmake -E chdir ${PROJECT_SOURCE_DIR} $(MAKE) -f Makefile.tarball | ||
+ COMMAND cmake -E chdir ${PROJECT_SOURCE_DIR} make -f Makefile.tarball | ||
COMMAND cmake -E make_directory ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_LIB_DESTINATION}/${PROJECT_NAME} | ||
COMMAND cmake -E copy_if_different ${PROJECT_SOURCE_DIR}/build/output/lib/libfetch_drivers.so ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_LIB_DESTINATION}/libfetch_drivers.so | ||
COMMAND cmake -E copy_if_different ${PROJECT_SOURCE_DIR}/build/output/lib/libfetch_drivers_odva.so ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_LIB_DESTINATION}/libfetch_drivers_odva.so |