Issue 364

Author: Jon Little

.gitlab-ci.yml

@@ -145,19 +145,19 @@ test_core:
   script:
     - cd build
     - ctest -j 4
-    - cd ..
+    #- cd ..
     # Execute once to get the tabular output (which we can scrape for gitlab)
-    - echo $PWD
-    - gcovr --object-directory=build/core/tests/ORD/CMakeFiles/OrdUnitTests_T.dir -r . -e .*_T.cpp
+    #- echo $PWD
+    #- gcovr --object-directory=build/core/tests/ORD/CMakeFiles/OrdUnitTests_T.dir -r . -e .*_T.cpp
     # Execute again, generating html
-    - mkdir gcovr
-    - gcovr --object-directory=build/core/tests/ORD/CMakeFiles/OrdUnitTests_T.dir --html --html-details -o gcovr/index.html -r . -e .*_T.cpp
+    #- mkdir gcovr
+    #- gcovr --object-directory=build/core/tests/ORD/CMakeFiles/OrdUnitTests_T.dir --html --html-details -o gcovr/index.html -r . -e .*_T.cpp
   dependencies:
     - build_core
-  artifacts:
-    paths:
-    - gcovr
-    expire_in: 2 days
+  #artifacts:
+  #  paths:
+  #  - gcovr
+  #  expire_in: 2 days
 
 # Deploy Stage
 # Tests install of GPSTk on each platform, saves artifacts for downstream builds.

BuildSetup.cmake

@@ -13,6 +13,7 @@ elseif( WIN32 )
     set( STADYN "STATIC" )
 endif()
 
+
 #----------------------------------------
 # Platform-dependent Compiler flags
 #----------------------------------------
@@ -33,6 +34,7 @@ elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
     set( CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS} -O2" )
 elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
     # Do not optimize for debug builds.  Do the same for RELWITHDEBINFO ?
+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" )
     set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O2" )
     set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS} -O2" )
     set( CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS} -O2" )
@@ -78,7 +80,6 @@ endif()
 #----------------------------------------
 
 if( USE_RPATH )
-
     # Use, i.e. don't skip the full RPATH for the build tree
     set( CMAKE_SKIP_BUILD_RPATH FALSE )
 

core/tests/FileHandling/FFBinaryStream_T.cpp

@@ -267,7 +267,7 @@ testStream(const std::string& outfn, const std::string& reffn,
    #ifdef WIN32
    testFramework.assert(bool(testStrmIn), "Couldn't open " + outfn + " for input", __LINE__);
    #else
-   testFramework.assert(testStrmIn, "Couldn't open " + outfn + " for input", __LINE__);
+   testFramework.assert(static_cast<bool>(testStrmIn), "Couldn't open " + outfn + " for input", __LINE__);
    #endif
 
       // check file size

core/tests/ORD/CMakeLists.txt

@@ -1,16 +1,14 @@
 
-message( STATUS "Setting CMAKE_CURRENT_SOURCE_DIR = ${CMAKE_CURRENT_SOURCE_DIR}" )
-
 # --- Here's the existing CMake method
 
 # /usr/lib64/libgmock.so
 find_path(GMOCK_SOURCE_DIR NAMES src/gmock.cc CMakeLists.txt
-          PATHS /usr/src/gmock /usr/local/src/gmock)
+          PATHS /usr/src/gmock /usr/local/src/gmock /usr/src/googletest/googlemock)
 find_path(GMOCK_INCLUDE_DIR NAMES gmock.h
           PATHS /usr/include/gmock /usr/local/include/gmock)
 
 # If we can't locate the INCLUDE directory, just give up.
-if ( GMOCK_INCLUDE_DIR )
+if ( EXISTS ${GMOCK_INCLUDE_DIR}/CMakeLists.txt )
     # On Debian, gtest/gmock source is installed so it must be compiled.
     # On RedHat shared libraries are installed in standard locations.
     # MacOSX TBD