Update the include and library search paths used when building against a
local version of core Core switched to CMake a while back, resulting in build products (generated headers, libraries) ending up in different locations than before.
This commit is contained in:
parent
6ed42a95bb
commit
f8cee8d653
18
realm.gypi
18
realm.gypi
|
@ -14,11 +14,13 @@
|
||||||
}],
|
}],
|
||||||
["use_realm_debug", {
|
["use_realm_debug", {
|
||||||
"variables": {
|
"variables": {
|
||||||
"debug_library_suffix": "-dbg"
|
"debug_library_suffix": "-dbg",
|
||||||
|
"build_directory": "build.debug",
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
"variables": {
|
"variables": {
|
||||||
"debug_library_suffix": ""
|
"debug_library_suffix": "",
|
||||||
|
"build_directory": "build.release",
|
||||||
}
|
}
|
||||||
}]
|
}]
|
||||||
],
|
],
|
||||||
|
@ -40,10 +42,10 @@
|
||||||
"conditions": [
|
"conditions": [
|
||||||
["prefix!=''", {
|
["prefix!=''", {
|
||||||
"all_dependent_settings": {
|
"all_dependent_settings": {
|
||||||
"include_dirs": [ "<(prefix)/src" ],
|
"include_dirs": [ "<(prefix)/src", "<(prefix)/<(build_directory)/src" ],
|
||||||
},
|
},
|
||||||
"direct_dependent_settings": {
|
"direct_dependent_settings": {
|
||||||
"library_dirs": [ "<(prefix)/src/realm" ]
|
"library_dirs": [ "<(prefix)/<(build_directory)/src/realm" ]
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
"dependencies": [ "vendored-realm" ]
|
"dependencies": [ "vendored-realm" ]
|
||||||
|
@ -66,15 +68,15 @@
|
||||||
},
|
},
|
||||||
"conditions": [
|
"conditions": [
|
||||||
["prefix!=''", {
|
["prefix!=''", {
|
||||||
"all_dependent_settings+": {
|
"all_dependent_settings": {
|
||||||
"include_dirs": [ "<(prefix)/src" ],
|
"include_dirs": [ "<(prefix)/src" ],
|
||||||
},
|
},
|
||||||
"direct_dependent_settings+": {
|
"direct_dependent_settings": {
|
||||||
"library_dirs": [ "<(prefix)/src/realm" ]
|
"library_dirs": [ "<(prefix)/src/realm" ]
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
"dependencies+": [ "vendored-realm" ]
|
"dependencies": [ "vendored-realm" ]
|
||||||
}]
|
}],
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue