aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorredfish <redfish@galactica.pw>2016-09-03 17:39:45 -0400
committerredfish <redfish@galactica.pw>2016-09-03 17:44:28 -0400
commitb1d5189ae1b2c97f54cf45a021a3777366d3b0f8 (patch)
tree91a409b73c5d6e2b1a784f3436f44eba8258cb99 /src
parentMerge pull request #1039 (diff)
downloadmonero-b1d5189ae1b2c97f54cf45a021a3777366d3b0f8.tar.xz
cmake: fix def propagation, fixes 32-bit build
32-bit build would fail to link with 'mdb_env_create undefined' (because for 32-bit build, mdb_env_create_vl32 is defined instead). This bug was introduced with the recent change to virtual object libraries. The problem is that the COMPILE_DEFINITIONS property was not propagated from dependee target (lmdb) to depedent target's (blockchain_db) virtual object lib (obj_blockchain_db). This patch makes that happen. I chose to include INTERFACE_COMPILE_DEFINITIONS because there should not be a need to propagate private defs, but it doesn't make a difference in this case.
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6010e3805..55a276f06 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -92,6 +92,8 @@ function (bitmonero_add_library name)
set_property(TARGET "${name}"
PROPERTY
FOLDER "libs")
+ target_compile_definitions(${objlib}
+ PRIVATE $<TARGET_PROPERTY:${name},INTERFACE_COMPILE_DEFINITIONS>)
endfunction ()
add_subdirectory(common)