cmake commit

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.6) #version 2.8.6 at least required because of command set(CMAKE_AUTOMOC TRUE) for qt moc-ing (see below)
 project (NICELibrary)
 
 include(CheckSymbolExists)
@@ -12,7 +12,7 @@ include(CheckSymbolExists)
 set(NICELibrary_VERSION_MAJOR 1)
 set(NICELibrary_VERSION_MINOR 0)
 
-set(CMAKE_VERBOSE_MAKEFILE on) 
+set(CMAKE_VERBOSE_MAKEFILE off) 
 
 set(CMAKE_INSTALL_PREFIX ${PROJECT_BINARY_DIR})
 
@@ -42,7 +42,31 @@ if (PNG_FOUND)
   ADD_DEFINITIONS( "-DNICE_USELIB_PNG")
 endif()
 
-FIND_PACKAGE(Qt4)
+FIND_PACKAGE(Qt4)# COMPONENTS Qt3Support QtOpenGl)
+SET(QT_USE_QTOPENGL TRUE)
+SET(QT_USE_QT3SUPPORT TRUE)
+if(QT_FOUND)
+#  ADD_DEFINITIONS("-DQT3_SUPPORT")
+  message(STATUS "QTfound ${QT_QT3SUPPORT_INCLUDE_DIR}")
+  set(CMAKE_AUTOMOC TRUE) #see doc: http://blogs.kde.org/2011/11/01/cool-new-stuff-cmake-286-automoc
+  INCLUDE(${QT_USE_FILE})
+  #INCLUDE(${QT_QT3SUPPORT_INCLUDE_DIR})
+  ADD_DEFINITIONS(${QT_DEFINITIONS})
+  ADD_DEFINITIONS( "-DNICE_USELIB_QT")
+endif()
+find_package(OpenGL)
+if(OPENGL_FOUND)
+  message(STATUS "OPENGL found")
+  include_directories( ${OPENGL_INCLUDE_DIRS} )
+  ADD_DEFINITIONS( "-DNICE_USELIB_OPENGL")
+endif()
+
+find_package(GLUT)
+if(GLUT_FOUND)
+  message(STATUS "GLUT found")
+  include_directories( ${GLUT_INCLUDE_DIRS} )
+  ADD_DEFINITIONS( "-DNICE_USELIB_GLUT")
+endif()
 
 #find_package(ImageMagick COMPONENTS Magick++)
 #if(ImageMagick_FOUND)

core/CMakeLists.txt

@@ -5,13 +5,13 @@ include( progfiles.cmake)
 #message(STATUS "nice_core_hdr:${NICE_CORE_HDR}")
 
 ADD_LIBRARY(nice_core ${NICE_BUILD_LIBS_STATIC_SHARED} ${NICE_CORE_HDR} ${NICE_CORE_SRC})
-TARGET_LINK_LIBRARIES(nice_core ${Boost_LIBRARIES})
+TARGET_LINK_LIBRARIES(nice_core ${Boost_LIBRARIES} ${OPENGL_LIBRARY} ${GLUT_LIBRARY} ${QT_LIBRARIES})
 INSTALL(TARGETS nice_core DESTINATION lib)
 
 if(BUILD_CORE_PROGS)
   message(STATUS "building progs:")
   foreach(__progcpp ${NICE_PROGFILES_SRC})
-    message(STATUS "progcpp: ${__progcpp}")
+    #message(STATUS "progcpp: ${__progcpp}")
     get_filename_component(__progname ${__progcpp} NAME_WE )
     message(STATUS "progname: ${__progname}")
     ADD_EXECUTABLE( ${__progname} ${__progcpp})

core/corefiles.cmake

@@ -24,18 +24,18 @@ SET(NICE_CORE_SRC
 ./image/ImageInputStream.cpp
 ./image/Filter.cpp
 ./matlabAccess/MatFileIO.cpp
-# ./imagedisplay/DefaultMainWindow.cpp
-# ./imagedisplay/PolygonDrawer.cpp
-# ./imagedisplay/ArrayPlot.cpp
-# ./imagedisplay/CaptureDialog.cpp
-# ./imagedisplay/ImageDisplaySDL.cpp
-# ./imagedisplay/QtFramework.cpp
-# ./imagedisplay/CaptureWidget.cpp
-# ./imagedisplay/EpipolarGeometryDisplay.cpp
-# ./imagedisplay/ImageDisplayManager.cpp
-# ./imagedisplay/ImageDisplayManagerWidget.cpp
-# ./imagedisplay/SimpleSelector.cpp
-# ./imagedisplay/ImageDisplay.cpp
+./imagedisplay/DefaultMainWindow.cpp
+./imagedisplay/PolygonDrawer.cpp
+./imagedisplay/ArrayPlot.cpp
+./imagedisplay/CaptureDialog.cpp
+./imagedisplay/ImageDisplaySDL.cpp
+./imagedisplay/QtFramework.cpp
+./imagedisplay/CaptureWidget.cpp
+./imagedisplay/EpipolarGeometryDisplay.cpp
+./imagedisplay/ImageDisplayManager.cpp
+./imagedisplay/ImageDisplayManagerWidget.cpp
+./imagedisplay/SimpleSelector.cpp
+./imagedisplay/ImageDisplay.cpp
 ./basics/bzstream.cpp
 ./basics/tools.cpp
 ./basics/BinStreamable.cpp
@@ -141,19 +141,19 @@ set(NICE_CORE_HDR
 ./image/EllipseT.h
 ./image/FilterT.h
 ./matlabAccess/MatFileIO.h
-# ./imagedisplay/DefaultMainWindow.h
-# ./imagedisplay/ImageDisplay.h
-# ./imagedisplay/EpipolarGeometryDisplay.h
-# ./imagedisplay/OverlayColors.h
-# ./imagedisplay/CaptureWidget.h
-# ./imagedisplay/PolygonDrawer.h
-# ./imagedisplay/SimpleSelector.h
-# ./imagedisplay/CaptureDialog.h
-# ./imagedisplay/ImageDisplayManagerWidget.h
-# ./imagedisplay/QtFramework.h
-# ./imagedisplay/ImageDisplayManager.h
-# ./imagedisplay/ArrayPlot.h
-# ./imagedisplay/ImageDisplaySDL.h
+./imagedisplay/DefaultMainWindow.h
+./imagedisplay/ImageDisplay.h
+./imagedisplay/EpipolarGeometryDisplay.h
+./imagedisplay/OverlayColors.h
+./imagedisplay/CaptureWidget.h
+./imagedisplay/PolygonDrawer.h
+./imagedisplay/SimpleSelector.h
+./imagedisplay/CaptureDialog.h
+./imagedisplay/ImageDisplayManagerWidget.h
+./imagedisplay/QtFramework.h
+./imagedisplay/ImageDisplayManager.h
+./imagedisplay/ArrayPlot.h
+./imagedisplay/ImageDisplaySDL.h
 ./basics/bzstream.h
 ./basics/RoundToNearest.h
 ./basics/FrameRateCounter.h

core/progfiles.cmake

@@ -6,7 +6,7 @@ set(NICE_PROGFILES_SRC
 ./image/progs/testGenericSobelFilter.cpp
 ./matlabAccess/progs/testMatFileIO.cpp
 ./progs/imageDemo.cpp
-#./imagedisplay/progs/showImage.cpp
+./imagedisplay/progs/showImage.cpp
 ./basics/progs/testConfig.cpp
 ./basics/progs/testMemoryUsage.cpp
 ./algebra/progs/testILSMinResLanczos.cpp