King_DuckZ/cmake-d
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove internal cached variables

Browse source
This commit is contained in:
Dragos Carp 2013-10-15 21:43:42 +02:00
parent 77f3ad4ab0
commit c50d03b475
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cmaked/CMakeDetermineDCompiler.cmake
View file

@ -116,10 +116,12 @@ IF(NOT CMAKE_D_COMPILER_ID_RUN)
FILE(READ ${CMAKE_PLATFORM_ID_CONTENT_FILE} CMAKE_D_COMPILER_ID_PLATFORM_CONTENT)
INCLUDE(${CMAKE_ROOT}/Modules/CMakeDetermineCompilerId.cmake)
# Workaround for bug http://public.kitware.com/Bug/view.php?id=14481
FIND_FILE(CMAKE_COMPILER_ID_FILE_IN CMakeDCompilerId.d.in PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH})
FILE(RELATIVE_PATH CMAKE_COMPILER_ID_FILE_IN_RELATIVE ${CMAKE_ROOT}/Modules ${CMAKE_COMPILER_ID_FILE_IN})
STRING(REGEX REPLACE "[.]in$" "" CMAKE_COMPILER_ID_FILE_RELATIVE ${CMAKE_COMPILER_ID_FILE_IN_RELATIVE})
FIND_FILE(CMAKE_D_COMPILER_ID_FILE_IN CMakeDCompilerId.d.in PATHS ${CMAKE_ROOT}/Modules ${CMAKE_MODULE_PATH})
FILE(RELATIVE_PATH CMAKE_D_COMPILER_ID_FILE_IN_RELATIVE ${CMAKE_ROOT}/Modules ${CMAKE_D_COMPILER_ID_FILE_IN})
STRING(REGEX REPLACE "[.]in$" "" CMAKE_COMPILER_ID_FILE_RELATIVE ${CMAKE_D_COMPILER_ID_FILE_IN_RELATIVE})
CMAKE_DETERMINE_COMPILER_ID(D DFLAGS ${CMAKE_COMPILER_ID_FILE_RELATIVE})
UNSET(CMAKE_D_COMPILER_ID_FILE_IN CACHE)
UNSET(CMAKE_PLATFORM_ID_CONTENT_FILE CACHE)
# Set old compiler and platform id variables.
IF("${CMAKE_D_COMPILER_ID}" MATCHES "GNU")
@ -132,9 +134,6 @@ IF(NOT CMAKE_D_COMPILER_ID_RUN)
ENDIF("${CMAKE_D_PLATFORM_ID}" MATCHES "MinGW")
ENDIF(NOT CMAKE_D_COMPILER_ID_RUN)
INCLUDE(CMakeFindBinUtils)
IF(MSVC_D_ARCHITECTURE_ID)
SET(SET_MSVC_D_ARCHITECTURE_ID

3
cmaked/CMakeTestDCompiler.cmake
View file

@ -71,6 +71,7 @@ ELSE(NOT CMAKE_D_COMPILER_WORKS)
@ONLY IMMEDIATE # IMMEDIATE must be here for compatibility mode <= 2.0
)
INCLUDE(${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeDCompiler.cmake)
UNSET(CMAKE_D_COMPILER_ABI_SRC CACHE)
UNSET(CMAKE_D_COMPILER_CMAKE_IN CACHE)
ENDIF(CMAKE_D_COMPILER_FORCED)
ENDIF(NOT CMAKE_D_COMPILER_WORKS)