Removed unneded files, unneeded variable->str and msvc/clcache refere…

…nces
PointCloudLibrary · Oct 8, 2019 · b530ced · b530ced
1 parent 7bd666e
commit b530ced
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 28 deletions.
diff --git a/.ci/azure-pipelines/build-windows.yml b/.ci/azure-pipelines/build-windows.yml
@@ -42,8 +42,8 @@ jobs:
       - script: clcache -z
         displayName: 'Zero ccache statistics'
       - script: |
-          echo ##vso[task.setvariable variable=CXX]clcache.exe
-          echo ##vso[task.setvariable variable=C]clcache.exe
+          setx CXX clcache.exe
+          setx C clcache.exe
         displayName: 'Set clcache as the compiler'
       - script: |
           rmdir %VCPKG_ROOT%\downloads /S /Q

diff --git a/cmake/Modules/UseCompilerCache.cmake b/cmake/Modules/UseCompilerCache.cmake
@@ -57,8 +57,8 @@ function(UseCompilerCache)
     return()
   endif()
 
-  if(CCACHE_PROGRAM MATCHES "clcache")
-    message(FATAL_ERROR "clcache can't be configured as a compiler. Please use environment variables CXX and C to set the compiler as clcache.")
+  if(CMAKE_GENERATOR MATCHES "Visual")
+    message(FATAL_ERROR "MSVC isn't compatible with current solutions. Please rename compiler cache to cl.exe and prepend its location in env PATH variable")
     return()
   endif()
 
@@ -68,7 +68,6 @@ function(UseCompilerCache)
   foreach(line ${output})
     string(TOLOWER ${line} line)
     string(REGEX REPLACE "^ccache version ([\\.0-9]+)$" "\\1" version "${line}")
-    #if(version AND NOT "x${line}" STREQUAL "x${version}")
     if(version)
       set(COMPILER_CACHE_VERSION ${version} PARENT_SCOPE)
       break()
@@ -80,11 +79,11 @@ function(UseCompilerCache)
   endif()
 
   set(xcode_compat FALSE)
-  if(${CMAKE_GENERATOR} STREQUAL Xcode)
+  if(CMAKE_GENERATOR STREQUAL Xcode)
     set(xcode_compat TRUE)
   endif()
   set(ccache_compat FALSE)
-  if((${ARGS_CCACHE} STREQUAL ccache) AND (${version} VERSION_LESS 3.3.0))
+  if((ARGS_CCACHE STREQUAL ccache) AND (version VERSION_LESS 3.3.0))
     set(ccache_compat TRUE)
   endif()
 

diff --git a/cmake/launch-c.in b/cmake/launch-c.in
diff --git a/cmake/launch-cxx.in b/cmake/launch-cxx.in
diff --git a/cmake/pcl_options.cmake b/cmake/pcl_options.cmake
@@ -43,7 +43,7 @@ option(PCL_ENABLE_SSE "Enable or Disable SSE optimizations." ON)
 mark_as_advanced(PCL_ENABLE_SSE)
 
 # Allow the user to disable ccache if ccache is available
-option(PCL_ENABLE_CCACHE "Enable using ccache (or clcache for MSVC) for compilation" OFF)
+option(PCL_ENABLE_CCACHE "Enable using compiler cache for compilation" OFF)
 mark_as_advanced(PCL_ENABLE_CCACHE)
 
 # Display timing information for each compiler instance on screen