Skip to content

Fix position of catkin_package() #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: next
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ if(CATKIN_DEVEL_PREFIX)
message(STATUS "Build package with catkin")
set(BUILD_WITHOUT_ROS OFF)
find_package(catkin REQUIRED)
catkin_package(
LIBRARIES ${PROJECT_NAME}
INCLUDE_DIRS include
# CATKIN_DEPENDS async_port
# DEPENDS system_lib
)
else()
message(STATUS "Build package with cmake")
set(BUILD_WITHOUT_ROS ON)
Expand Down Expand Up @@ -188,13 +194,6 @@ if(BUILD_WITHOUT_ROS) # BUILD_WITHOUT_ROS

else() # BUILD_WITHOUT_ROS

catkin_package(
LIBRARIES ${PROJECT_NAME}
INCLUDE_DIRS include
# CATKIN_DEPENDS async_port
# DEPENDS system_lib
)

## Add catkin install targets
install(TARGETS ${PROJECT_NAME}
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
Expand Down