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

Fix defines not being passed on to gdc.

Browse source
This commit is contained in:
King_DuckZ 2017-11-23 10:36:40 +00:00
parent 2f3f6b1b07
commit f7434a12ad
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmake-d/CMakeDInformation.cmake
View file

@ -152,6 +152,10 @@ if(NOT CMAKE_INCLUDE_FLAG_D)
set(CMAKE_INCLUDE_FLAG_D ${CMAKE_INCLUDE_FLAG_D}) set(CMAKE_INCLUDE_FLAG_D ${CMAKE_INCLUDE_FLAG_D})
endif() endif()
if(NOT CMAKE_D_DEFINE_FLAG)
set(CMAKE_D_DEFINE_FLAG ${CMAKE_D_DEFINE_FLAG})
endif()
if(NOT CMAKE_INCLUDE_FLAG_SEP_D) if(NOT CMAKE_INCLUDE_FLAG_SEP_D)
set(CMAKE_INCLUDE_FLAG_SEP_D ${CMAKE_INCLUDE_FLAG_SEP_D}) set(CMAKE_INCLUDE_FLAG_SEP_D ${CMAKE_INCLUDE_FLAG_SEP_D})
endif() endif()
@ -267,7 +271,7 @@ if(NOT 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() else()
set(CMAKE_D_COMPILE_OBJECT set(CMAKE_D_COMPILE_OBJECT
"<CMAKE_D_COMPILER> <FLAGS> <INCLUDES> ${CMAKE_D_DASH_O}<OBJECT> -c <SOURCE>") "<CMAKE_D_COMPILER> <FLAGS> <INCLUDES> <DEFINES> ${CMAKE_D_DASH_O}<OBJECT> -c <SOURCE>")
endif() endif()
endif() endif()

1
cmake-d/Platform/Linux-gdc.cmake
View file

@ -39,3 +39,4 @@ set(CMAKE_D_CREATE_ASSEMBLY_SOURCE "<CMAKE_D_COMPILER> <FLAGS> -S <SOURCE> -o <A
# set(CMAKE_INCLUDE_SYSTEM_FLAG_D "-isystem ") # set(CMAKE_INCLUDE_SYSTEM_FLAG_D "-isystem ")
set(CMAKE_INCLUDE_FLAG_D "-I") # -I set(CMAKE_INCLUDE_FLAG_D "-I") # -I
set(CMAKE_D_DEFINE_FLAG "-fversion=")