Merge branch 'develop'

Author: Kent Knox

.travis.yml

@@ -133,7 +133,7 @@ deploy:
   draft: true
   skip_cleanup: true
   api_key:
-    secure: MBkxtcfSk+4UvGRO+WRhmS86vIVzAs0LIF2sAtr/S+Ed+OdUAuhZypUsDXGWtK3mL55v9c8BZXefFfHfJqElcNmyHKwCptbCR/JiM8YBtjoy2/RW1NcJUZp+QuRlk23xPADj7QkPjv7dfrQUMitkLUXAD+uTmMe2l8gmlbhMrQqPBKhb+31FNv6Lmo6oa6GjbiGi7qjsrJc7uQjhppLam+M7BZbBALGbIqMIrb2BMDMMhBoDbb4zSKrSg3+krd3kKiCClJlK7xjIlyFXZ527ETQ+PMtIeQb0eJ3aQwa4caBRCm5BDzt8GnJ48S88EkynbQioCEE87ebcyOM7M+wfslW/Fm1Y86X5odIljkOmTNKoDvgLxc9vUCBtMyVHNIgZcToPdsrMsGxcHV+JtU3yVQVm6dnA5P/zG5bA+aBjsd7p7BdOE4fdhvZV5XRAk/wmiyWalF7hKJxHIiWAKknL+tpPDDUF+fHmDDsdf7yRDJBegNcKfw4+m19MIvLn9fbiNVCtwCAL1T4yWkIEpi4MRMDPtftmkZPbi6UwluOJUTeCeHe4en99Yu2haemNPqXs6rR0LlXGk31GQwzlrNfb+94F5tT2a4Ka4PsruA2NMW/IYCYEE5Gu7PihVDR031Fn9cdCU9kefUgyB07rJD6q/W+ljsU0osyg7VxyfMg8rkw=
+    secure: "Bx51QUNYPnJlkJS7D97huRxYzs26kOZst76S0uTmBWp8ZU7gAm6mY79pFbXW9mkL2r6EPX5l5p+pPOwo1kmN/eB3jicamA07oLcI0ZQw4XLxszVEiOLMNXSLFYnsee0RkVX4fu453XXOFDoQupN/JKHUtp4VReJHIiWgQPnvF3Xu7kBLGecKr9IrWV23ig+7z3oiTEO+MTIR/z9mmHnzdAf4K0Nh+9BdtI2QVuVbpRZxPRqLIakMHoYw18h2SdY44wYK+sC+AroU9QWCr5t26GJDzWdu0nrv05ChQqaC128z8+hs+jaPbx39ByBH3BxD05FrKtCO3W0O6VycHewFitrMeMCkXizDn3XzXRkw8bM8OpqFPW/++f5DqxgN+Yh9eIb2vY1QiBjaQ6VIvd/9egVILw6/cxVXlym9iNVwuO2ZG0COKMHoLP/2ZlvPbuoXYgEtZYqqUnvBHVu1SxzrABxR+Cp44McbuB2EFLHYxjA7msF/h+yilfE5e4FdD91MpjR26ASmP3rMx9xUe6h28rGgei3RXNNeF0vnMO65qwfImuUbQ3/on+KW6LlMKFptqq3Twp7wcBdh433bvsrwCW0BDP0eanWuImpS0z3reqcTJFrl0rzplpQmJAW38dcSWTI7MvlDKcMHLJMNy+2or7mIGCj1m9o9Yr6INC7W2Rg="
   file_glob: true
   file: ${CLSPARSE_ROOT}/clSPARSE-build/*.tar.gz
   on:

CMakeLists.txt

@@ -38,7 +38,7 @@ endif()
 if( POLICY CMP0048 )
   cmake_policy( SET CMP0048 NEW )
 
-  project( SuperBuild.clSPARSE VERSION 0.10.1.0 )
+  project( SuperBuild.clSPARSE VERSION 0.11.1.0 )
 else( )
   project( SuperBuild.clSPARSE )
 
@@ -48,7 +48,7 @@ else( )
   endif( )
 
   if( NOT DEFINED SuperBuild.clSPARSE_VERSION_MINOR )
-    set( SuperBuild.clSPARSE_VERSION_MINOR 10 )
+    set( SuperBuild.clSPARSE_VERSION_MINOR 11 )
   endif( )
 
   if( NOT DEFINED SuperBuild.clSPARSE_VERSION_PATCH )

cmake/ExternalBoost.cmake

@@ -91,11 +91,11 @@ elseif( MSVC14 )
   list( APPEND Boost.Command toolset=msvc-14.0 )
 elseif( XCODE_VERSION )
   list( APPEND Boost.Command toolset=clang )
-elseif( DEFINED ENV{CC} )
+elseif( ENV{CC} )
   # CMake apprarently puts the full path of the compiler into CC
   # The user might specify a non-default gcc compiler through ENV
   message( STATUS "ENV{CC}=$ENV{CC}" )
-  get_filename_component( gccToolset $ENV{CC} NAME )
+  get_filename_component( gccToolset "$ENV{CC}" NAME )
 
   # see: https://svn.boost.org/trac/boost/ticket/5917
   string( TOLOWER ${gccToolset} gccToolset )

cmake/ExternalGmock.cmake

@@ -25,7 +25,7 @@ message( STATUS "ext.gMock_Version: " ${ext.gMock_Version} )
 if( DEFINED ENV{GMOCK_URL} )
   set( ext.gMock_URL "$ENV{GMOCK_URL}" CACHE STRING "URL to download gMock from" )
 else( )
-  set( ext.gMock_URL "https://googlemock.googlecode.com/files/gmock-${ext.gMock_Version}.zip" CACHE STRING "URL to download gMock from" )
+  set( ext.gMock_URL "https://github.com/google/googletest/archive/release-${ext.gMock_Version}.zip" CACHE STRING "URL to download gMock from" )
 endif( )
 mark_as_advanced( ext.gMock_URL )
 
@@ -91,7 +91,7 @@ endif( )
 ExternalProject_Add(
   gMock
   URL ${ext.gMock_URL}
-  URL_MD5 073b984d8798ea1594f5e44d85b20d66
+  URL_MD5 ef5e700c8a0f3ee123e2e0209b8b4961
   CMAKE_ARGS ${ext.gMock.cmake_args} -DCMAKE_DEBUG_POSTFIX=d
   BUILD_COMMAND ${ext.gMock.Make}
   INSTALL_COMMAND ""

src/CMakeLists.txt

@@ -37,7 +37,7 @@ endif()
 # clSPARSE becomes the name of the project with a particular version
 if( POLICY CMP0048 )
 	cmake_policy( SET CMP0048 NEW )
-	project( clSPARSE VERSION 0.10.1.0 LANGUAGES C CXX )
+	project( clSPARSE VERSION 0.11.1.0 LANGUAGES C CXX )
 else( )
 	project( clSPARSE C CXX )
 	# Define a version for the code
@@ -46,7 +46,7 @@ else( )
 	endif( )
 
 	if( NOT DEFINED clSPARSE_VERSION_MINOR )
-		set( clSPARSE_VERSION_MINOR 10 )
+		set( clSPARSE_VERSION_MINOR 11 )
 	endif( )
 
 	if( NOT DEFINED clSPARSE_VERSION_PATCH )

src/library/internal/kernel-wrap.hpp

@@ -78,9 +78,7 @@ class KernelWrap
         assert(argCounter < kernel.getInfo<CL_KERNEL_NUM_ARGS>());
 
         cl_int status = 0;
-        status = kernel.setArg(argCounter++, sizeof(cl_mem), (const void*)val);
-
-
+        status = kernel.setArg(argCounter++, sizeof(cl_mem), (const void*)&val);
         return *this;
     }