Skip to content

Commit

Permalink
removed the -dev packages
Browse files Browse the repository at this point in the history
  • Loading branch information
tpanzarella committed Mar 29, 2017
1 parent fcd9c95 commit ec51e5b
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion modules/camera/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ endif()
if(BUILD_SDK_PKG)
install(DIRECTORY ${IFM3D_CAMERA_BINARY_DIR}/include
DESTINATION ${CPACK_INSTALL_PREFIX}
COMPONENT camera-dev
COMPONENT camera
PATTERN "*.in" EXCLUDE
PATTERN ".git" EXCLUDE
PATTERN "*~" EXCLUDE
Expand Down
2 changes: 1 addition & 1 deletion modules/framegrabber/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ endif()
if(BUILD_SDK_PKG)
install(DIRECTORY ${IFM3D_FG_BINARY_DIR}/include
DESTINATION ${CPACK_INSTALL_PREFIX}
COMPONENT framegrabber-dev
COMPONENT framegrabber
PATTERN "*.in" EXCLUDE
PATTERN ".git" EXCLUDE
PATTERN "*~" EXCLUDE
Expand Down
3 changes: 2 additions & 1 deletion modules/framegrabber/test/ifm3d-fg-tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ TEST(FrameGrabber, SoftwareTrigger)
LOG(INFO) << "SoftwareTrigger test";
auto cam = ifm3d::Camera::MakeShared();

// Doesn't look like s/w triggering is implemented yet on O3X
// Need to implement s/w triggering on o3x -- not ready yet
if (cam->IsO3X())
{
return;
Expand All @@ -148,6 +148,7 @@ TEST(FrameGrabber, SoftwareTrigger)
{
fg->SWTrigger();
EXPECT_TRUE(fg->WaitForFrame(buff.get(), 1000));

}

// Now, because O3X establishes an edit session for purposes
Expand Down
2 changes: 1 addition & 1 deletion modules/image/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ endif()
if(BUILD_SDK_PKG)
install(DIRECTORY ${IFM3D_IMAGE_BINARY_DIR}/include
DESTINATION ${CPACK_INSTALL_PREFIX}
COMPONENT image-dev
COMPONENT image
PATTERN "*.in" EXCLUDE
PATTERN ".git" EXCLUDE
PATTERN "*~" EXCLUDE
Expand Down
2 changes: 1 addition & 1 deletion modules/tools/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ add_subdirectory(src)
if(BUILD_SDK_PKG)
install(DIRECTORY ${IFM3D_TOOLS_BINARY_DIR}/include
DESTINATION ${CPACK_INSTALL_PREFIX}
COMPONENT tools-dev
COMPONENT tools
PATTERN "*.in" EXCLUDE
PATTERN ".git" EXCLUDE
PATTERN "*~" EXCLUDE
Expand Down

0 comments on commit ec51e5b

Please sign in to comment.