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

Fix #10: CMake 3.4.0: <FLAGS> no longer includes <INCLUDES>

Browse source
This commit is contained in:
Dragos Carp 2016-08-06 17:52:37 +02:00
parent 18c7e125bf
commit 0dbc13fcb6
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmake-d/CMakeDInformation.cmake
View file

@ -220,6 +220,7 @@ include(CMakeCommonLanguageInclude)
# <OBJECT> # <OBJECT>
# <LINK_LIBRARIES> # <LINK_LIBRARIES>
# <FLAGS> # <FLAGS>
# <INCLUDES> (cmake 3.4.0 or later)
# <LINK_FLAGS> # <LINK_FLAGS>
# D compiler information # D compiler information
@ -261,8 +262,13 @@ set(CMAKE_D_ARCHIVE_FINISH "<CMAKE_RANLIB> <TARGET>")
# compile a D file into an object file # compile a D file into an object file
if(NOT CMAKE_D_COMPILE_OBJECT) if(NOT CMAKE_D_COMPILE_OBJECT)
if(CMAKE_VERSION VERSION_LESS 3.4.0)
set(CMAKE_D_COMPILE_OBJECT set(CMAKE_D_COMPILE_OBJECT
"<CMAKE_D_COMPILER> <FLAGS> ${CMAKE_D_DASH_O}<OBJECT> -c <SOURCE>") "<CMAKE_D_COMPILER> <FLAGS> ${CMAKE_D_DASH_O}<OBJECT> -c <SOURCE>")
else()
set(CMAKE_D_COMPILE_OBJECT
"<CMAKE_D_COMPILER> <FLAGS> <INCLUDES> ${CMAKE_D_DASH_O}<OBJECT> -c <SOURCE>")
endif()
endif() endif()
if(NOT CMAKE_D_LINK_EXECUTABLE) if(NOT CMAKE_D_LINK_EXECUTABLE)