D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-11 18:33:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed path to generated *.di files

Browse Source
This commit is contained in:
Alexey Prokhin
2011-12-02 22:16:08 +04:00
parent 014d6bdd4d
commit b559805b7c
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ldc2.rebuild.conf.in
View File

@@ -1,2 +1,2 @@
[Environment]
DFLAGS=-I@INCLUDE_INSTALL_DIR@/phobos -I-I@INCLUDE_INSTALL_DIR@/ldc -I@INCLUDE_INSTALL_DIR@ -L-L@CMAKE_INSTALL_LIBDIR@ -defaultlib=@RUNTIME_AIO@ -debuglib=@RUNTIME_AIO@
DFLAGS=-I-I@INCLUDE_INSTALL_DIR@/ldc -I@INCLUDE_INSTALL_DIR@ -L-L@CMAKE_INSTALL_LIBDIR@ -defaultlib=@RUNTIME_AIO@ -debuglib=@RUNTIME_AIO@

2
ldc2_phobos.conf.in
View File

@@ -7,7 +7,7 @@ default:
// 'switches' holds array of string that are appends to the command line
// arguments before they are parsed.
switches = [
"-I@PROJECT_BINARY_DIR@/../import",
"-I@CMAKE_BINARY_DIR@/import",
"-I@RUNTIME_DIR@/import",
"-I@RUNTIME_DIR@/src",
"-I@PHOBOS2_DIR@/",

4
runtime/CMakeLists.txt
View File

@@ -223,7 +223,7 @@ macro(dc INPUT_D OUTLIST_O OUTLIST_BC MOREFLAGS PATH SUFFIX)
else (INDEX EQUAL -1)
string(REGEX REPLACE "src/ldc" "src/core" output ${output})
string(REGEX REPLACE "^src/" "" di_output ${output})
set(DI_CMD -Hf=${PROJECT_BINARY_DIR}/import/${di_output}.di)
set(DI_CMD -Hf=${CMAKE_BINARY_DIR}/import/${di_output}.di)
list(REMOVE_AT GENERATE_DI ${INDEX})
endif (INDEX EQUAL -1)
@@ -400,7 +400,7 @@ endif(MULTILIB)
#
if(D_VERSION EQUAL 2)
install(DIRECTORY ${PROJECT_BINARY_DIR}/import/core DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.di")
install(DIRECTORY ${CMAKE_BINARY_DIR}/import/core DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.di")
if(PHOBOS2_DIR)
install(DIRECTORY ${PHOBOS2_DIR}/std DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.d")
install(DIRECTORY ${PHOBOS2_DIR}/etc DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.d")