Changed layout of find_object folders... moved main.cpp to app folder (prepare for ros externals...)

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@30 620bd6b2-0a58-f614-fd9a-1bd335dccda9

src/CMakeLists.txt

@@ -1,142 +0,0 @@
-
-
-### Qt Gui stuff ###
-SET(headers_ui 
-	./MainWindow.h
-	./AddObjectDialog.h
-	./ObjWidget.h
-	./Camera.h
-	./ParametersToolBox.h
-)
-
-SET(uis
-    ./ui/mainWindow.ui
-    ./ui/addObjectDialog.ui
-)
-
-#SET(qrc 
-#    ./GuiLib.qrc
-#)
-
-# generate rules for building source files from the resources
-#QT4_ADD_RESOURCES(srcs_qrc ${qrc})
-
-#Generate .h files from the .ui files
-QT4_WRAP_UI(moc_uis ${uis})
-
-#This will generate moc_* for Qt
-QT4_WRAP_CPP(moc_srcs ${headers_ui})
-### Qt Gui stuff  end###
-
-
-SET(SRC_FILES 
-	./MainWindow.cpp
-	./AddObjectDialog.cpp
-	./KeypointItem.cpp
-	./qtipl.cpp
-	./main.cpp
-	./Camera.cpp
-	./ParametersToolBox.cpp
-	./Settings.cpp
-	./ObjWidget.cpp
-	${moc_srcs} 
-	${moc_uis} 
-	#${srcs_qrc}
-)
-
-SET(INCLUDE_DIRS
-	${CMAKE_CURRENT_SOURCE_DIR}
-	${OpenCV_INCLUDE_DIRS}
-	${CMAKE_CURRENT_BINARY_DIR} # for qt ui generated in binary dir
-)
-
-INCLUDE(${QT_USE_FILE})
-
-SET(LIBRARIES
-    ${QT_LIBRARIES} 
-    ${OpenCV_LIBS} 
-)
-
-#include files
-INCLUDE_DIRECTORIES(${INCLUDE_DIRS})
-
-# create an executable file
-IF(APPLE AND BUILD_AS_BUNDLE)
-  ADD_EXECUTABLE(find_object MACOSX_BUNDLE ${SRC_FILES})
-ELSE()
-  ADD_EXECUTABLE(find_object WIN32 ${SRC_FILES})
-ENDIF()
-# Linking with Qt libraries
-TARGET_LINK_LIBRARIES(find_object ${LIBRARIES})
-
-IF(APPLE AND BUILD_AS_BUNDLE)
-  SET_TARGET_PROPERTIES(find_object PROPERTIES
-    OUTPUT_NAME ${CMAKE_BUNDLE_NAME})
-ELSEIF(WIN32)
-  SET_TARGET_PROPERTIES(find_object PROPERTIES
-    OUTPUT_NAME ${PROJECT_NAME})
-ELSE()
-  SET_TARGET_PROPERTIES(find_object PROPERTIES
-    OUTPUT_NAME ${PROJECT_PREFIX})
-ENDIF()
-
-#---------------------------
-# Installation stuff
-#--------------------------- 
-INSTALL(TARGETS find_object
-        RUNTIME DESTINATION bin COMPONENT runtime
-        BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}" COMPONENT runtime)
-        
-#---------------------------
-# Dependencies packaging
-#---------------------------
-IF(APPLE AND BUILD_AS_BUNDLE)
-  INSTALL(CODE "execute_process(COMMAND ln -s \"../MacOS/${CMAKE_BUNDLE_NAME}\" ${PROJECT_NAME}
-        WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)")
-ENDIF(APPLE AND BUILD_AS_BUNDLE)
-
-SET(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/${PROJECT_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
-IF((APPLE AND BUILD_AS_BUNDLE) OR WIN32)
-  SET(plugin_dest_dir bin)
-  SET(qtconf_dest_dir bin)
-  IF(APPLE)
-    SET(plugin_dest_dir MacOS)
-    SET(qtconf_dest_dir Resources)
-    SET(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/MacOS/${CMAKE_BUNDLE_NAME}")
-  ENDIF(APPLE)
-  
-  # Install needed Qt plugins by copying directories from the qt installation
-  # One can cull what gets copied by using 'REGEX "..." EXCLUDE'
-  # Exclude debug libraries
-  INSTALL(DIRECTORY "${QT_PLUGINS_DIR}/imageformats" 
-          DESTINATION ${plugin_dest_dir}/plugins 
-          COMPONENT runtime 
-          REGEX ".*d4.dll" EXCLUDE
-          REGEX ".*d4.a" EXCLUDE)
-  
-  # install a qt.conf file
-  # this inserts some cmake code into the install script to write the file
-  SET(QT_CONF_FILE [Paths]\nPlugins=plugins)
-  IF(APPLE)
-    SET(QT_CONF_FILE [Paths]\nPlugins=MacOS/plugins)
-  ENDIF(APPLE)
-  INSTALL(CODE "
-    file(WRITE \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"${QT_CONF_FILE}\")
-    " COMPONENT runtime)
-
-  # directories to look for dependencies
-  SET(DIRS ${QT_LIBRARY_DIRS} ${PROJECT_SOURCE_DIR}/bin)
-
-  # Now the work of copying dependencies into the bundle/package
-  # The quotes are escaped and variables to use at install time have their $ escaped
-  # An alternative is the do a configure_file() on a script and use install(SCRIPT  ...).
-  # Note that the image plugins depend on QtSvg and QtXml, and it got those copied
-  # over.
-  # To find dependencies, cmake use "otool" on Apple and "dumpbin" on Windows (make sure you have one of them).
-  install(CODE "
-   file(GLOB_RECURSE QTPLUGINS \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
-    include(\"BundleUtilities\")
-    fixup_bundle(\"${APPS}\" \"\${QTPLUGINS}\" \"${DIRS}\")
-  " COMPONENT runtime)
-ENDIF((APPLE AND BUILD_AS_BUNDLE) OR WIN32)
-

src/main.cpp

@@ -1,18 +0,0 @@
-#include <QtGui/QApplication>
-#include "MainWindow.h"
-
-int main(int argc, char* argv[])
-{
-	/* Create tasks */
-	QApplication app(argc, argv);
-	MainWindow mainWindow;
-
-	mainWindow.showNormal();
-
-	// Now wait for application to finish
-	app.connect( &app, SIGNAL( lastWindowClosed() ),
-				&app, SLOT( quit() ) );
-	app.exec();// MUST be called by the Main Thread
-
-    return 0;
-}