2.7 with delta

.gitignore

@@ -1,7 +1,7 @@
 # Editor backup files:
 *~
 .*.swp
-build/*
+build*/
 
 # Build output
 *.o

BuildSetup.cmake

@@ -1,10 +1,7 @@
-
-if( DEBUG_SWITCH )
-    message( STATUS "DEBUG: Included CMake file BuildSetup.cmake" )
-endif()
-
+# gpstk/BuildSetup.cmake
 #========================================
-# Set Platform-Dependent Options
+# Try to keep all the platform dependent
+# options in this file
 #========================================
 
 #----------------------------------------
@@ -20,18 +17,20 @@ endif()
 # Platform-dependent Compiler flags
 #----------------------------------------
 if( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -compat=5 -erroff=hidevf,wvarhidemem,badargtype2w" )
+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -erroff=hidevf,wvarhidemem,badargtype2w" )
+    # add -DCMAKE_CXX_FLAGS=-std=c++03 or =-std=c++11 on the CMAKE invocation
     set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -mt -shared" )
 elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
     set( CMAKE_SHARED_LIBRARY_SUFFIX .dylib )
     set( CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" )
     set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -shared" )
 elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2" )
     set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -shared" )
 elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
 
 else()
-    message( ERROR "ERROR: CMAKE_SYSTEM_NAME = ${CMAKE_SYSTEM_NAME}, not supported. Currently supported: Linux, Darwin, SunOS, " )
+    message( ERROR "CMAKE_SYSTEM_NAME = ${CMAKE_SYSTEM_NAME}, not supported. Currently supported: Linux, Darwin, SunOS, Windows" )
 endif()
 
 #----------------------------------------
@@ -76,97 +75,80 @@ endif( "${isSystemDir}" STREQUAL "-1" )
 
 
 #----------------------------------------
-# Debug Messages
-#
-# The CMake command-line tool, message( STATUS ) displays 
-# messages on stdout and all other message types on stderr. 
-#----------------------------------------
-
-if( DEBUG_SWITCH )
-    message( STATUS "DEBUG: CMAKE_SYSTEM              = ${CMAKE_SYSTEM}" )      # e.g., Linux-3.2.0
-    message( STATUS "DEBUG: CMAKE_SYSTEM_NAME         = ${CMAKE_SYSTEM_NAME}" ) # e.g., Linux
-    message( STATUS "DEBUG: UNIX                      = ${UNIX}" ) # e.g., is the platform UNIX ?
-    message( STATUS "DEBUG: APPLE                     = ${APPLE}" ) # e.g., is the platform OSX?
-    message( STATUS "DEBUG: WIN32                     = ${WIN32}" ) # e.g., is the platform Windows?
-    message( STATUS "DEBUG: MSVC11                    = ${MSVC11}" ) # e.g., is the platform VisualStudio?
-    message( STATUS "DEBUG: MSVC12                    = ${MSVC12}" ) # e.g., is the platform VisualStudio?
-    message( STATUS "DEBUG: CMAKE_COMMAND             = ${CMAKE_COMMAND}" )     # e.g., /usr/bin/cmake
-    message( STATUS "DEBUG: CMAKE_VERSION             = ${CMAKE_VERSION}" )     # e.g., 2.8.9
-    message( STATUS "DEBUG: CMAKE_BUILD_TOOL          = ${CMAKE_BUILD_TOOL}" )  # e.g., /usr/bin/make
-    message( STATUS "DEBUG: STADYN                    = ${STADYN}" )
-    message( STATUS "DEBUG: CMAKE_COMPILER_IS_GNUCC   = ${CMAKE_COMPILER_IS_GNUCC}" )
-    message( STATUS "DEBUG: CMAKE_CXX_FLAGS           = ${CMAKE_CXX_FLAGS}" )
-    message( STATUS "DEBUG: CMAKE_SHARED_LINKER_FLAGS = ${CMAKE_SHARED_LINKER_FLAGS}" )
-    message( STATUS "DEBUG: CMAKE_SKIP_BUILD_RPATH    = ${CMAKE_SKIP_BUILD_RPATH}" )
-    message( STATUS "DEBUG: CMAKE_INSTALL_RPATH       = ${CMAKE_INSTALL_RPATH}" )
-    message( STATUS "DEBUG: CMAKE_BUILD_WITH_INSTALL_RPATH = ${CMAKE_BUILD_WITH_INSTALL_RPATH}" )
-    message( STATUS "DEBUG: CMAKE_INSTALL_RPATH_USE_LINK_PATH = ${CMAKE_INSTALL_RPATH_USE_LINK_PATH}" )
-    message( STATUS "DEBUG: CMAKE_CURRENT_LIST_DIR   = ${CMAKE_CURRENT_LIST_DIR}" )    # e.g., $HOME/git/gpstk
-    message( STATUS "DEBUG: CMAKE_CURRENT_LIST_FILE  = ${CMAKE_CURRENT_LIST_FILE}" )   # e.g., $HOME/git/gpstk/CMakeLists.txt
-    message( STATUS "DEBUG: CMAKE_SOURCE_DIR         = ${CMAKE_SOURCE_DIR}" )          # e.g., $HOME/git/gpstk
-    message( STATUS "DEBUG: CMAKE_CURRENT_SOURCE_DIR = ${CMAKE_CURRENT_SOURCE_DIR}" )  # e.g., $HOME/git/gpstk
-    message( STATUS "DEBUG: CMAKE_CURRENT_BINARY_DIR = ${CMAKE_CURRENT_BINARY_DIR}" )  # e.g., $HOME/git/gpstk/build
-    message( STATUS "DEBUG: PROJECT_NAME             = ${PROJECT_NAME}" )              # e.g., gpstk
-    message( STATUS "DEBUG: PROJECT_BINARY_DIR       = ${PROJECT_BINARY_DIR}" )        # e.g., $HOME/git/gpstk/build
-    message( STATUS "DEBUG: PROJECT_SOURCE_DIR       = ${PROJECT_SOURCE_DIR}" )        # e.g., $HOME/git/gpstk
-    message( STATUS "DEBUG: CMAKE_INSTALL_DIR        = ${CMAKE_INSTALL_DIR}" )         # e.g., /usr
-    message( STATUS "DEBUG: CMAKE_INSTALL_PREFIX     = ${CMAKE_INSTALL_PREFIX}" )      # e.g., $HOME/.local/gpstk
-    if( BUILD_PYTHON )
-        message( STATUS "DEBUG: PYTHON_INSTALL_PREFIX    = ${PYTHON_INSTALL_PREFIX}" )     # e.g., $HOME/.local
-    endif()
+if( DEBUG_SWITCH AND NOT DEBUG_VERBOSE )
+    message( STATUS "CMAKE_SYSTEM              = ${CMAKE_SYSTEM}" )      # e.g., Linux-3.2.0
+    message( STATUS "CMAKE_SYSTEM_NAME         = ${CMAKE_SYSTEM_NAME}" ) # e.g., Linux
+    message( STATUS "UNIX                      = ${UNIX}" ) # e.g., is the platform UNIX ?
+    message( STATUS "APPLE                     = ${APPLE}" ) # e.g., is the platform OSX?
+    message( STATUS "WIN32                     = ${WIN32}" ) # e.g., is the platform Windows?
+    message( STATUS "MSVC11                    = ${MSVC11}" ) # e.g., is the platform VisualStudio?
+    message( STATUS "MSVC12                    = ${MSVC12}" ) # e.g., is the platform VisualStudio?
+    message( STATUS "CMAKE_COMMAND             = ${CMAKE_COMMAND}" )     # e.g., /usr/bin/cmake
+    message( STATUS "CMAKE_VERSION             = ${CMAKE_VERSION}" )     # e.g., 2.8.9
+    message( STATUS "CMAKE_BUILD_TOOL          = ${CMAKE_BUILD_TOOL}" )  # e.g., /usr/bin/make
+    message( STATUS "STADYN                    = ${STADYN}" )
+    message( STATUS "CMAKE_COMPILER_IS_GNUCC   = ${CMAKE_COMPILER_IS_GNUCC}" )
+    message( STATUS "CMAKE_CXX_FLAGS           = ${CMAKE_CXX_FLAGS}" )
+    message( STATUS "CMAKE_SHARED_LINKER_FLAGS = ${CMAKE_SHARED_LINKER_FLAGS}" )
+    message( STATUS "CMAKE_SKIP_BUILD_RPATH    = ${CMAKE_SKIP_BUILD_RPATH}" )
+    message( STATUS "CMAKE_INSTALL_RPATH       = ${CMAKE_INSTALL_RPATH}" )
+    message( STATUS "CMAKE_BUILD_WITH_INSTALL_RPATH = ${CMAKE_BUILD_WITH_INSTALL_RPATH}" )
+    message( STATUS "CMAKE_INSTALL_RPATH_USE_LINK_PATH = ${CMAKE_INSTALL_RPATH_USE_LINK_PATH}" )
+    message( STATUS "CMAKE_CURRENT_LIST_DIR   = ${CMAKE_CURRENT_LIST_DIR}" )    # e.g., $HOME/git/gpstk
+    message( STATUS "CMAKE_CURRENT_LIST_FILE  = ${CMAKE_CURRENT_LIST_FILE}" )   # e.g., $HOME/git/gpstk/CMakeLists.txt
+    message( STATUS "CMAKE_SOURCE_DIR         = ${CMAKE_SOURCE_DIR}" )          # e.g., $HOME/git/gpstk
+    message( STATUS "CMAKE_CURRENT_SOURCE_DIR = ${CMAKE_CURRENT_SOURCE_DIR}" )  # e.g., $HOME/git/gpstk
+    message( STATUS "CMAKE_CURRENT_BINARY_DIR = ${CMAKE_CURRENT_BINARY_DIR}" )  # e.g., $HOME/git/gpstk/build
+    message( STATUS "PROJECT_NAME             = ${PROJECT_NAME}" )              # e.g., gpstk
+    message( STATUS "PROJECT_BINARY_DIR       = ${PROJECT_BINARY_DIR}" )        # e.g., $HOME/git/gpstk/build
+    message( STATUS "PROJECT_SOURCE_DIR       = ${PROJECT_SOURCE_DIR}" )        # e.g., $HOME/git/gpstk
+    message( STATUS "CMAKE_INSTALL_DIR        = ${CMAKE_INSTALL_DIR}" )         # e.g., /usr
+    message( STATUS "CMAKE_INSTALL_PREFIX     = ${CMAKE_INSTALL_PREFIX}" )      # e.g., $HOME/.local/gpstk
 endif()
 
 #----------------------------------------
-# Debug Verbose: print all cmake variables
-#----------------------------------------
-
 if( DEBUG_VERBOSE )
     get_cmake_property( _variableNames VARIABLES )
     foreach( _variableName ${_variableNames} )
-        message( STATUS "---- DEBUG VERBOSE: ${_variableName} = ${${_variableName}}" )
+        message( STATUS "---- ${_variableName} = ${${_variableName}}" )
     endforeach()
 endif()
 
 #----------------------------------------
 # Get CMake vars into C++
 #----------------------------------------
-
 configure_file( "${PROJECT_SOURCE_DIR}/build_config.h.in" "${PROJECT_BINARY_DIR}/generated/build_config.h" )
 include_directories( "${PROJECT_BINARY_DIR}/generated/" ) 
 install( FILES "${PROJECT_BINARY_DIR}/generated/build_config.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" )
 
 
-#-----------------------------------------
-# Build debs, tgz packages for binaries 
-# Usage: "$ make package" 
-#-----------------------------------------
-
+#----------------------------------------
+if( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
+    set( CPACK_GENERATOR "TGZ" )
+elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
+    set( CPACK_GENERATOR "TGZ" )
+elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
+    set( CPACK_GENERATOR "DEB;TGZ" )
+elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
+    set( CPACK_GENERATOR "ZIP" )
+endif()
 
 set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "GPSTk libraries and applications for GNSS processing.") 
 set( CPACK_PACKAGE_VENDOR "ARL:UT SGL" )
 set( CPACK_PACKAGE_CONTACT "Bryan Parsons" )
-set( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt" )
-set( CPACK_PACKAGE_VERSION_MAJOR "${gpstk_VERSION_MAJOR}" )
-set( CPACK_PACKAGE_VERSION_MINOR "${gpstk_VERSION_MINOR}" )
-set( CPACK_PACKAGE_VERSION_PATCH "${gpstk_VERSION_PATCH}" )
+set( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md" )
+set( CPACK_PACKAGE_VERSION_MAJOR "${GPSTK_VERSION_MAJOR}" )
+set( CPACK_PACKAGE_VERSION_MINOR "${GPSTK_VERSION_MINOR}" )
+set( CPACK_PACKAGE_VERSION_PATCH "${GPSTK_VERSION_PATCH}" )
 set( CPACK_INCLUDE_TOPLEVEL_DIRECTORY "OFF" )
+set( CPACK_PACKAGE_INSTALL_DIRECTORY "gpstk")
+set( CPACK_TOPLEVEL_TAG "gpstk" ) 
 
 set( CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.13)" )
 set( CPACK_DEBIAN_SECTION "stable" )
 set( CPACK_DEBIAN_PACKAGE_SECTION "science" )
 
-set( CPACK_GENERATOR "DEB;TGZ" )
-
-#-----------------------------------------
-# Build tgz packages for source release
-# Usage: "$ make package_source" 
-#-----------------------------------------
-
-set( CPACK_SOURCE_IGNORE_FILES "/build/")
+set( CPACK_SOURCE_IGNORE_FILES "${PROJECT_BINARY_DIR}" "build-*/" "/.git" )
 set( CPACK_SOURCE_GENERATOR "TGZ")
 
 include( CPack )
-
-#----------------------------------------
-# The End
-#----------------------------------------

CMakeLists.txt

@@ -8,41 +8,27 @@
 
 cmake_minimum_required( VERSION 2.8.5 )
 
-project( gpstk )
-set( "${PROJECT_NAME}_VERSION_MAJOR" "2" )
-set( "${PROJECT_NAME}_VERSION_MINOR" "6" )
-set( "${PROJECT_NAME}_VERSION_PATCH" "0" )
+project( GPSTK )
+set( GPSTK_VERSION_MAJOR "2" )
+set( GPSTK_VERSION_MINOR "7" )
+set( GPSTK_VERSION_PATCH "0" )
+set( GPSTK_VERSION "${GPSTK_VERSION_MAJOR}.${GPSTK_VERSION_MINOR}.${GPSTK_VERSION_PATCH}" )
 
 #============================================================
 # Set up
 #============================================================
 
-#----------------------------------------
-# Determine Installation Path Prefix
-#     Path to which we will install the
-#     gpstk /lib, /bin, and /include dirs.
-#----------------------------------------
+# This sets up veriables contining GNU standard installation locations.
+include( GNUInstallDirs )
 
-if( DEFINED CMAKE_INSTALL_PREFIX )
-    message( STATUS "CMAKE_INSTALL_PREFIX was defined by user with the cmake command line. CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" )
-elseif( DEFINED ENV{gpstk} )
-    set( CMAKE_INSTALL_PREFIX $ENV{gpstk} )
-    message( STATUS "CMAKE_INSTALL_PREFIX was defined the environment variable ENV{gpstk}. CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX} " )
-else()
-    message( STATUS "CMAKE_INSTALL_PREFIX was not defined by any supported method." )
-	message( STATUS "Either set an environment variable ENV{gpstk} or pass in a cmake variable as -DCMAKE_INSTALL_PREFIX")
-    message( FATAL_ERROR "CMAKE_INSTALL_PREFIX must be set by the user. Exitting now!" )
-    return()
-endif()
+# For now, override to use 'lib' for the library install dir.
+set( CMAKE_INSTALL_LIBDIR lib )
 
-include( GNUInstallDirs )
-# For now, overrride to use 'lib' for the library install dir.
-set ( CMAKE_INSTALL_LIBDIR lib )
+# Set a filename for collecting exported targets.
+set( EXPORT_TARGETS_FILENAME "GPSTKTargets" )
 
 #----------------------------------------
 # Option Switches
-#
-# Usage: option( <option_variable> "help string" [initial value] )
 #----------------------------------------
 
 option( DEBUG_SWITCH "HELP: DEBUG_SWITCH: Default = OFF, print some CMake variable values to stdout." OFF )
@@ -51,6 +37,12 @@ option( BUILD_EXT "HELP: BUILD_EXT: SWITCH, Default = OFF, Build the ext library
 option( TEST_SWITCH "HELP: TEST_SWITCH: SWITCH, Default = OFF, Turn on test mode." OFF )
 option( BUILD_PYTHON "HELP: BUILD_PYTHON: SWITCH, Default = OFF, Turn on processing of python extension package." OFF )
 
+if( BUILD_PYTHON AND !BUILD_EXT )
+    message( WARNING "Combination of BUILD_PYTHON=ON and BUILD_EXT=OFF is not allowed. Python swig bindings depend on gpstk/ext." )
+    message( WARNING "Setting BUILD_EXT = TRUE" )
+    set( BUILD_EXT TRUE )
+endif()
+
 #----------------------------------------
 # Pull in Build Config
 #----------------------------------------
@@ -139,30 +131,18 @@ endif()
 add_library( gpstk ${STADYN} ${GPSTK_SRC_FILES} ${GPSTK_INC_FILES} )
 
 # GPSTk library install target
-install( TARGETS gpstk DESTINATION "${CMAKE_INSTALL_LIBDIR}" EXPORT "${PROJECT_NAME}Config" )
+install( TARGETS gpstk DESTINATION "${CMAKE_INSTALL_LIBDIR}" EXPORT "${EXPORT_TARGETS_FILENAME}" )
 
-# GPSTk header file install target \todo without "/gpstk"?
+# GPSTk header file install target
 install( FILES ${GPSTK_INC_FILES} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/gpstk" )
 
 #============================================================
 # Testing
 #============================================================
 
-# CMake command enable_testing() enables capability 
-# to use CMake add_test() command for this directory and below. 
-# This adds another build target, which is "test" for 
-# Makefile generators, or "RUN_TESTS" for IDEs (e.g. Visual Studio).
-# From that point on, you can use the ADD_TEST() command 
-# to add tests cases to the project build target test:
-#
-#     add_test( testname Exename arg1 arg2 ... )
-#
-# Must call enable_test() prior to any add_subdirectory() 
-# that is intended to contain test cases.
-
 if( TEST_SWITCH )
   enable_testing()
-  list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules )
+#  include( CTest )
 endif( )
 
 #----------------------------------------
@@ -174,22 +154,29 @@ add_subdirectory( core )
 if( BUILD_EXT )
    add_subdirectory( ext )
    add_subdirectory( examples )
+   if( BUILD_PYTHON )
+       include( PythonSetup.cmake )
+       add_subdirectory( swig )
+   endif()
 endif()
 
-if( BUILD_PYTHON )
-   add_subdirectory( swig )
-endif()
 
 #----------------------------------------
 # Export the project import cmake files.
 #----------------------------------------
-
-configure_file( "${CMAKE_SOURCE_DIR}/ProjectConfig-misc.cmake.in" "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config-misc.cmake" )
-# \todo make smth with it
-#install( FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config-misc.cmake" DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}" )
-#install( EXPORT "${PROJECT_NAME}Config" DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}" )
-
-#============================================================
-# The End
-#============================================================
-
+#include( CMakePackageConfigHelpers )
+#set( INSTALL_CONFIG_DIR ${CMAKE_INSTALL_DATADIR}/cmake/GPSTK)
+#configure_package_config_file( ${CMAKE_CURRENT_SOURCE_DIR}/GPSTKConfig.cmake.in
+#    ${CMAKE_CURRENT_BINARY_DIR}/GPSTKConfig.cmake
+#    INSTALL_DESTINATION ${INSTALL_CONFIG_DIR}
+#    PATH_VARS CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_BINDIR CMAKE_INSTALL_PREFIX INSTALL_CONFIG_DIR )
+#write_basic_package_version_file( ${CMAKE_CURRENT_BINARY_DIR}/GPSTKConfigVersion.cmake
+#    VERSION ${GPSTK_VERSION}
+#    COMPATIBILITY ExactVersion )
+#install( FILES
+#    ${CMAKE_CURRENT_BINARY_DIR}/GPSTKConfig.cmake
+#    ${CMAKE_CURRENT_BINARY_DIR}/GPSTKConfigVersion.cmake
+#    DESTINATION
+#    ${INSTALL_CONFIG_DIR} )
+#
+#install( EXPORT ${EXPORT_TARGETS_FILENAME} DESTINATION ${INSTALL_CONFIG_DIR} )

CTestConfig.cmake

@@ -0,0 +1,15 @@
+## This file should be placed in the root directory of your project.
+## Then modify the CMakeLists.txt file in the root directory of your
+## project to incorporate the testing dashboard.
+##
+## # The following are required to submit to the CDash dashboard:
+##   ENABLE_TESTING()
+##   INCLUDE(CTest)
+
+set(CTEST_PROJECT_NAME "GPSTk")
+set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")
+
+set(CTEST_DROP_METHOD "http")
+set(CTEST_DROP_SITE "cdash.arlut.utexas.edu")
+set(CTEST_DROP_LOCATION "/CDash/submit.php?project=GPSTk")
+set(CTEST_DROP_SITE_CDASH TRUE)