Cleanup bundle building.

chparsons · Sep 1, 2011 · 54d0386 · 54d0386
1 parent a0ec014
commit 54d0386
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 85 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt")
 SET(CPACK_PACKAGE_VERSION_MAJOR "0")
 SET(CPACK_PACKAGE_VERSION_MINOR "6")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
+SET(CPACK_PACKAGE_VERSION_PATCH "1")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
 IF(APPLE)
   set(CPACK_BINARY_DRAGNDROP ON)

diff --git a/calibration/CMakeLists.txt b/calibration/CMakeLists.txt
@@ -2,32 +2,21 @@ SET(common_sources calibration_common.h calibration_common.cpp)
 
 ADD_EXECUTABLE(annotate_image annotate_image.cpp ${common_sources})
 TARGET_LINK_LIBRARIES(annotate_image nestk)
-#INSTALL(TARGETS annotate_image DESTINATION bin)
 
 ADD_EXECUTABLE(calibrate_kinect calibrate_kinect.cpp ${common_sources})
 TARGET_LINK_LIBRARIES(calibrate_kinect nestk)
-#INSTALL(TARGETS calibrate_kinect DESTINATION bin)
 
-ADD_EXECUTABLE(calibrate_projector calibrate_projector.cpp ${common_sources})
+NESTK_ADD_EXECUTABLE(calibrate_projector calibrate_projector.cpp ${common_sources})
 TARGET_LINK_LIBRARIES(calibrate_projector nestk)
-#INSTALL(TARGETS calibrate_projector DESTINATION bin)
 
-ADD_EXECUTABLE(calibrate-multiple-kinects calibrate_multiple_kinects.cpp ${common_sources})
+NESTK_ADD_EXECUTABLE(calibrate-multiple-kinects calibrate_multiple_kinects.cpp ${common_sources})
 TARGET_LINK_LIBRARIES(calibrate-multiple-kinects nestk)
 
-ADD_EXECUTABLE(calibrate-openni-intrinsics calibrate_openni_intrinsics.cpp ${common_sources})
+NESTK_ADD_EXECUTABLE(calibrate-openni-intrinsics calibrate_openni_intrinsics.cpp ${common_sources})
 TARGET_LINK_LIBRARIES(calibrate-openni-intrinsics nestk)
 
-ADD_EXECUTABLE(calibrate-openni-depth calibrate_openni_depth.cpp ${common_sources})
+NESTK_ADD_EXECUTABLE(calibrate-openni-depth calibrate_openni_depth.cpp ${common_sources})
 TARGET_LINK_LIBRARIES(calibrate-openni-depth nestk)
 
-IF (BUILD_MACOSX_BUNDLE)
-   ADD_EXECUTABLE(calibrate_kinect_ir MACOSX_BUNDLE calibrate_kinect_ir.cpp ${common_sources})
-   SET(DIRS ${QT_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/lib ${CMAKE_BINARY_DIR}/bin)
-   INSTALL_STANDALONE_BUNDLE(calibrate_kinect_ir ${DIRS})
-ELSE()
-   ADD_EXECUTABLE(calibrate_kinect_ir calibrate_kinect_ir.cpp ${common_sources})
-ENDIF()
-
+NESTK_ADD_EXECUTABLE(calibrate_kinect_ir calibrate_kinect_ir.cpp ${common_sources})
 TARGET_LINK_LIBRARIES(calibrate_kinect_ir nestk)
-INSTALL(TARGETS calibrate_kinect_ir DESTINATION bin)
diff --git a/multikinect/CMakeLists.txt b/multikinect/CMakeLists.txt
@@ -21,15 +21,5 @@ SET(rgbd_multikinect_sources ${moc_sources} ${uic_sources}
                RawImagesWindow.cpp RawImagesWindow.h
 )
 
-IF (BUILD_MACOSX_BUNDLE)
-   ADD_EXECUTABLE(rgbd-multikinect MACOSX_BUNDLE ${rgbd_multikinect_sources})
-   SET(DIRS ${QT_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/lib ${CMAKE_BINARY_DIR}/bin)
-   INSTALL_STANDALONE_BUNDLE(rgbd-multikinect ${DIRS})
-ELSE()
-   ADD_EXECUTABLE(rgbd-multikinect ${rgbd_multikinect_sources})
-ENDIF()
-
-TARGET_LINK_LIBRARIES(rgbd-multikinect
-                      nestk)
-
-INSTALL(TARGETS rgbd-multikinect DESTINATION bin)
+NESTK_ADD_EXECUTABLE(rgbd-multikinect ${rgbd_multikinect_sources})
+TARGET_LINK_LIBRARIES(rgbd-multikinect nestk)
diff --git a/nestk b/nestk
diff --git a/object/CMakeLists.txt b/object/CMakeLists.txt
@@ -25,13 +25,5 @@ SET(rgbd_object_sources ${moc_sources} ${uic_sources}
                ModelAcquisitionWindow.cpp ModelAcquisitionWindow.h
 )
 
-IF (BUILD_MACOSX_BUNDLE)
-   ADD_EXECUTABLE(rgbd-object ${rgbd_object_sources})
-   SET(DIRS ${QT_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/lib ${CMAKE_BINARY_DIR}/bin)
-   INSTALL_STANDALONE_BUNDLE(rgbd-object ${DIRS})
-ELSE()
-   ADD_EXECUTABLE(rgbd-object ${rgbd_object_sources})
-ENDIF()
-
-TARGET_LINK_LIBRARIES(rgbd-object
-                      nestk)
+NESTK_ADD_EXECUTABLE(rgbd-object ${rgbd_object_sources})
+TARGET_LINK_LIBRARIES(rgbd-object nestk)
diff --git a/people-tracker/CMakeLists.txt b/people-tracker/CMakeLists.txt
@@ -21,15 +21,5 @@ SET(rgbd_people_tracker_sources ${moc_sources} ${uic_sources}
                PeopleTracker.cpp PeopleTracker.h
                PeopleTrackerWindow.cpp PeopleTrackerWindow.h)
 
-IF (BUILD_MACOSX_BUNDLE)
-   ADD_EXECUTABLE(rgbd-people-tracker MACOSX_BUNDLE ${rgbd_people_tracker_sources})
-   SET(DIRS ${QT_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/lib ${CMAKE_BINARY_DIR}/bin)
-   INSTALL_STANDALONE_BUNDLE(rgbd-people-tracker ${DIRS})
-ELSE()
-   ADD_EXECUTABLE(rgbd-people-tracker ${rgbd_people_tracker_sources})
-ENDIF()
-
-TARGET_LINK_LIBRARIES(rgbd-people-tracker
-                      nestk)
-
-INSTALL(TARGETS rgbd-people-tracker DESTINATION bin)
+NESTK_ADD_EXECUTABLE(rgbd-people-tracker ${rgbd_people_tracker_sources})
+TARGET_LINK_LIBRARIES(rgbd-people-tracker nestk)
diff --git a/reconstructor/CMakeLists.txt b/reconstructor/CMakeLists.txt
@@ -21,14 +21,6 @@ SET(reconstructor_sources ${moc_sources} ${uic_sources}
                FiltersWindow.cpp FiltersWindow.h
                ModelAcquisitionWindow.cpp ModelAcquisitionWindow.h)
 
-IF (BUILD_MACOSX_BUNDLE)
-   ADD_EXECUTABLE(rgbd-reconstructor MACOSX_BUNDLE ${reconstructor_sources})
-   SET(DIRS ${QT_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/lib ${CMAKE_BINARY_DIR}/bin)
-   INSTALL_STANDALONE_BUNDLE(rgbd-reconstructor ${DIRS})
-ELSE()
-   ADD_EXECUTABLE(rgbd-reconstructor ${reconstructor_sources})
-ENDIF()
+NESTK_ADD_EXECUTABLE(rgbd-reconstructor ${reconstructor_sources})
+TARGET_LINK_LIBRARIES(rgbd-reconstructor nestk)
 
-TARGET_LINK_LIBRARIES(rgbd-reconstructor
-                      nestk)
-INSTALL(TARGETS rgbd-reconstructor DESTINATION bin)
diff --git a/skeletor/CMakeLists.txt b/skeletor/CMakeLists.txt
@@ -14,14 +14,5 @@ SET(rgbd_skeletor_sources ${moc_sources} ${uic_sources}
                RawImagesWindow.h RawImagesWindow.cpp
                GuiController.cpp GuiController.h)
 
-IF (BUILD_MACOSX_BUNDLE)
-   ADD_EXECUTABLE(rgbd-skeletor MACOSX_BUNDLE ${rgbd_skeletor_sources}) 
-   SET(DIRS ${QT_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/lib ${CMAKE_BINARY_DIR}/bin)
-   INSTALL_STANDALONE_BUNDLE(rgbd-skeletor ${DIRS})
-ELSE()
-   ADD_EXECUTABLE(rgbd-skeletor ${rgbd_skeletor_sources})
-ENDIF()
-
-TARGET_LINK_LIBRARIES(rgbd-skeletor
-                      nestk)
-INSTALL(TARGETS rgbd-skeletor DESTINATION bin)
+NESTK_ADD_EXECUTABLE(rgbd-skeletor ${rgbd_skeletor_sources})
+TARGET_LINK_LIBRARIES(rgbd-skeletor nestk)
diff --git a/viewer/CMakeLists.txt b/viewer/CMakeLists.txt
@@ -25,16 +25,6 @@ SET(rgbd_viewer_sources ${moc_sources} ${uic_sources}
                RawImagesWindow.cpp RawImagesWindow.h
 )
 
-IF (BUILD_MACOSX_BUNDLE)
-   ADD_EXECUTABLE(rgbd-viewer MACOSX_BUNDLE ${rgbd_viewer_sources}) 
-   SET(DIRS ${QT_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}/lib ${CMAKE_BINARY_DIR}/bin)
-   INSTALL_STANDALONE_BUNDLE(rgbd-viewer ${DIRS})
-ELSE()
-   ADD_EXECUTABLE(rgbd-viewer ${rgbd_viewer_sources})
-ENDIF()
-
-TARGET_LINK_LIBRARIES(rgbd-viewer
-                      nestk)
-
-INSTALL(TARGETS rgbd-viewer DESTINATION bin)
+NESTK_ADD_EXECUTABLE(rgbd-viewer ${rgbd_viewer_sources})
+TARGET_LINK_LIBRARIES(rgbd-viewer nestk)