aboutsummaryrefslogtreecommitdiff
path: root/src/CMakeLists.txt
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-09-18 11:44:08 +0200
committerRiccardo Spagni <ric@spagni.net>2016-09-18 11:44:08 +0200
commit4a03a8a1da1341fcceeb8a73a24ea1b4cedb443c (patch)
treeae9b02dcb8c241b719e0f8ea7c4ef3fe991b9f3a /src/CMakeLists.txt
parentMerge pull request #1093 (diff)
parentcmake: support BUILD_SHARED_LIBS built-in option (diff)
downloadmonero-4a03a8a1da1341fcceeb8a73a24ea1b4cedb443c.tar.xz
Merge pull request #1094
06bb692 cmake: support BUILD_SHARED_LIBS built-in option (redfish) e1c7af3 cmake: transitive deps and remove deprecated LINK_* (redfish) 54010b9 crypto: armv7: slow-hash: remove redundant source include (redfish)
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r--src/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 55a276f06..31694cf81 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -66,7 +66,7 @@ function (bitmonero_add_executable name)
add_executable("${name}"
${ARGN})
target_link_libraries("${name}"
- LINK_PRIVATE
+ PRIVATE
${EXTRA_LIBRARIES})
set_property(TARGET "${name}"
PROPERTY
@@ -88,7 +88,7 @@ function (bitmonero_add_library name)
# libwallet, which combines multiple components.
set(objlib obj_${name})
add_library(${objlib} OBJECT ${ARGN})
- add_library("${name}" STATIC $<TARGET_OBJECTS:${objlib}>)
+ add_library("${name}" $<TARGET_OBJECTS:${objlib}>)
set_property(TARGET "${name}"
PROPERTY
FOLDER "libs")