Skip to content

Commit b530ced

Browse files
committed
Removed unneded files, unneeded variable->str and msvc/clcache references
1 parent 7bd666e commit b530ced

File tree

5 files changed

+7
-28
lines changed

5 files changed

+7
-28
lines changed

.ci/azure-pipelines/build-windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ jobs:
4242
- script: clcache -z
4343
displayName: 'Zero ccache statistics'
4444
- script: |
45-
echo ##vso[task.setvariable variable=CXX]clcache.exe
46-
echo ##vso[task.setvariable variable=C]clcache.exe
45+
setx CXX clcache.exe
46+
setx C clcache.exe
4747
displayName: 'Set clcache as the compiler'
4848
- script: |
4949
rmdir %VCPKG_ROOT%\downloads /S /Q

cmake/Modules/UseCompilerCache.cmake

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ function(UseCompilerCache)
5757
return()
5858
endif()
5959

60-
if(CCACHE_PROGRAM MATCHES "clcache")
61-
message(FATAL_ERROR "clcache can't be configured as a compiler. Please use environment variables CXX and C to set the compiler as clcache.")
60+
if(CMAKE_GENERATOR MATCHES "Visual")
61+
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")
6262
return()
6363
endif()
6464

@@ -68,7 +68,6 @@ function(UseCompilerCache)
6868
foreach(line ${output})
6969
string(TOLOWER ${line} line)
7070
string(REGEX REPLACE "^ccache version ([\\.0-9]+)$" "\\1" version "${line}")
71-
#if(version AND NOT "x${line}" STREQUAL "x${version}")
7271
if(version)
7372
set(COMPILER_CACHE_VERSION ${version} PARENT_SCOPE)
7473
break()
@@ -80,11 +79,11 @@ function(UseCompilerCache)
8079
endif()
8180

8281
set(xcode_compat FALSE)
83-
if(${CMAKE_GENERATOR} STREQUAL Xcode)
82+
if(CMAKE_GENERATOR STREQUAL Xcode)
8483
set(xcode_compat TRUE)
8584
endif()
8685
set(ccache_compat FALSE)
87-
if((${ARGS_CCACHE} STREQUAL ccache) AND (${version} VERSION_LESS 3.3.0))
86+
if((ARGS_CCACHE STREQUAL ccache) AND (version VERSION_LESS 3.3.0))
8887
set(ccache_compat TRUE)
8988
endif()
9089

cmake/launch-c.in

Lines changed: 0 additions & 10 deletions
This file was deleted.

cmake/launch-cxx.in

Lines changed: 0 additions & 10 deletions
This file was deleted.

cmake/pcl_options.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ option(PCL_ENABLE_SSE "Enable or Disable SSE optimizations." ON)
4343
mark_as_advanced(PCL_ENABLE_SSE)
4444

4545
# Allow the user to disable ccache if ccache is available
46-
option(PCL_ENABLE_CCACHE "Enable using ccache (or clcache for MSVC) for compilation" OFF)
46+
option(PCL_ENABLE_CCACHE "Enable using compiler cache for compilation" OFF)
4747
mark_as_advanced(PCL_ENABLE_CCACHE)
4848

4949
# Display timing information for each compiler instance on screen

0 commit comments

Comments
 (0)