cmake: support 2.8.7

Older versions of CMake support LINK_{PUBLIC,PRIVATE} while newer versions prefer PUBLIC and PRIVATE instead, but still support the LINK_ prefix.
2014-10-24 14:48:14 -04:00 · 2014-10-24 14:48:14 -04:00 · 7d708e4223
parent 464c2805e5
commit 7d708e4223
22 changed files with 28 additions and 28 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -28,7 +28,7 @@
 # 
 # Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers

-cmake_minimum_required(VERSION 2.8.6)
+cmake_minimum_required(VERSION 2.8.7)

 project(bitmonero)

--- a/external/unbound/CMakeLists.txt
+++ b/external/unbound/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.8)
+cmake_minimum_required(VERSION 2.8.7)

 project(unbound C)

@ -163,18 +163,18 @@ add_library(unbound
  ${compat_src}
  ${libunbound_src})
 target_link_libraries(unbound
-  PRIVATE
+  LINK_PRIVATE
    ${OPENSSL_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT})
 if (LIBEVENT2_FOUND)
  target_link_libraries(unbound
-    PRIVATE
+    LINK_PRIVATE
      ${LIBEVENT2_LIBRARIES})
 endif ()

 if (WIN32)
  target_link_libraries(unbound
-    PRIVATE
+    LINK_PRIVATE
      iphlpapi
      ws2_32)
 endif ()
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -55,7 +55,7 @@ function (bitmonero_add_executable name)
  add_executable("${name}"
    ${ARGN})
  target_link_libraries("${name}"
-    PRIVATE
+    LINK_PRIVATE
      ${EXTRA_LIBRARIES})
  set_property(TARGET "${name}"
    PROPERTY
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@ -52,7 +52,7 @@ bitmonero_add_library(common
  ${common_headers}
  ${common_private_headers})
 target_link_libraries(common
-  PRIVATE
+  LINK_PRIVATE
    crypto
    ${UNBOUND_LIBRARY}
    ${Boost_DATE_TIME_LIBRARY}
--- a/src/connectivity_tool/CMakeLists.txt
+++ b/src/connectivity_tool/CMakeLists.txt
@ -35,7 +35,7 @@ bitmonero_add_executable(connectivity_tool
  ${connectivity_tool_sources}
  ${connectivity_tool_private_headers})
 target_link_libraries(connectivity_tool
-  PRIVATE
+  LINK_PRIVATE
    cryptonote_core
    crypto
    common
--- a/src/cryptonote_core/CMakeLists.txt
+++ b/src/cryptonote_core/CMakeLists.txt
@ -67,13 +67,13 @@ bitmonero_add_library(cryptonote_core
  ${cryptonote_core_headers}
  ${cryptonote_core_private_headers})
 target_link_libraries(cryptonote_core
-  PUBLIC
+  LINK_PUBLIC
    common
    crypto
    ${Boost_DATE_TIME_LIBRARY}
    ${Boost_PROGRAM_OPTIONS_LIBRARY}
    ${Boost_SERIALIZATION_LIBRARY}
-  PRIVATE
+  LINK_PRIVATE
    ${Boost_FILESYSTEM_LIBRARY}
    ${Boost_SYSTEM_LIBRARY}
    ${Boost_THREAD_LIBRARY}
--- a/src/daemon/CMakeLists.txt
+++ b/src/daemon/CMakeLists.txt
@ -57,7 +57,7 @@ bitmonero_add_executable(daemon
  ${daemon_headers}
  ${daemon_private_headers})
 target_link_libraries(daemon
-  PRIVATE
+  LINK_PRIVATE
    rpc
    cryptonote_core
    crypto
--- a/src/miner/CMakeLists.txt
+++ b/src/miner/CMakeLists.txt
@ -43,7 +43,7 @@ bitmonero_add_executable(simpleminer
  ${simpleminer_headers}
  ${simpleminer_private_headers})
 target_link_libraries(simpleminer
-  PRIVATE
+  LINK_PRIVATE
    cryptonote_core
    common
    ${Boost_FILESYSTEM_LIBRARY}
--- a/src/mnemonics/CMakeLists.txt
+++ b/src/mnemonics/CMakeLists.txt
@ -48,5 +48,5 @@ bitmonero_add_library(mnemonics
  ${mnemonics_headers}
  ${mnemonics_private_headers})
 target_link_libraries(mnemonics
-  PRIVATE
+  LINK_PRIVATE
    ${Boost_SYSTEM_LIBRARY})
--- a/src/rpc/CMakeLists.txt
+++ b/src/rpc/CMakeLists.txt
@ -43,7 +43,7 @@ bitmonero_add_library(rpc
  ${rpc_headers}
  ${rpc_private_headers})
 target_link_libraries(rpc
-  PRIVATE
+  LINK_PRIVATE
    cryptonote_core
    ${Boost_CHRONO_LIBRARY}
    ${Boost_REGEX_LIBRARY}
--- a/src/simplewallet/CMakeLists.txt
+++ b/src/simplewallet/CMakeLists.txt
@ -43,7 +43,7 @@ bitmonero_add_executable(simplewallet
  ${simplewallet_headers}
  ${simplewallet_private_headers})
 target_link_libraries(simplewallet
-  PRIVATE
+  LINK_PRIVATE
    wallet
    rpc
    cryptonote_core
--- a/src/wallet/CMakeLists.txt
+++ b/src/wallet/CMakeLists.txt
@ -46,10 +46,10 @@ bitmonero_add_library(wallet
  ${wallet_headers}
  ${wallet_private_headers})
 target_link_libraries(wallet
-  PUBLIC
+  LINK_PUBLIC
    cryptonote_core
    mnemonics
-  PRIVATE
+  LINK_PRIVATE
    ${Boost_SERIALIZATION_LIBRARY}
    ${Boost_SYSTEM_LIBRARY}
    ${Boost_THREAD_LIBRARY}
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@ -75,7 +75,7 @@ add_executable(hash-target-tests
  ${hash_targets_sources}
  ${hash_targets_headers})
 target_link_libraries(hash-target-tests
-  PRIVATE
+  LINK_PRIVATE
    cryptonote_core)
 set_property(TARGET hash-target-tests
  PROPERTY
--- a/tests/core_proxy/CMakeLists.txt
+++ b/tests/core_proxy/CMakeLists.txt
@ -36,7 +36,7 @@ add_executable(core_proxy
  ${core_proxy_sources}
  ${core_proxy_headers})
 target_link_libraries(core_proxy
-  PRIVATE
+  LINK_PRIVATE
    cryptonote_core
    ${UPNP_LIBRARIES}
    ${Boost_CHRONO_LIBRARY}
--- a/tests/core_tests/CMakeLists.txt
+++ b/tests/core_tests/CMakeLists.txt
@ -58,7 +58,7 @@ add_executable(coretests
  ${core_tests_sources}
  ${core_tests_headers})
 target_link_libraries(coretests
-  PRIVATE
+  LINK_PRIVATE
    cryptonote_core
    ${Boost_FILESYSTEM_LIBRARY}
    ${Boost_SYSTEM_LIBRARY}
--- a/tests/daemon_tests/CMakeLists.txt
+++ b/tests/daemon_tests/CMakeLists.txt
@ -35,7 +35,7 @@ add_executable(transfers
  ${transfers_sources}
  ${transfers_headers})
 target_link_libraries(transfers
-  PRIVATE
+  LINK_PRIVATE
    useragent
    rpc
    cryptonote_core
--- a/tests/difficulty/CMakeLists.txt
+++ b/tests/difficulty/CMakeLists.txt
@ -35,7 +35,7 @@ add_executable(difficulty-tests
  ${difficulty_sources}
  ${difficulty_headers})
 target_link_libraries(difficulty-tests
-  PRIVATE
+  LINK_PRIVATE
    cryptonote_core)
 set_property(TARGET difficulty-tests
  PROPERTY
--- a/tests/functional_tests/CMakeLists.txt
+++ b/tests/functional_tests/CMakeLists.txt
@ -39,7 +39,7 @@ add_executable(functional_tests
  ${functional_tests_sources}
  ${functional_tests_headers})
 target_link_libraries(functional_tests
-  PRIVATE
+  LINK_PRIVATE
    cryptonote_core
    wallet
    common
--- a/tests/hash/CMakeLists.txt
+++ b/tests/hash/CMakeLists.txt
@ -35,7 +35,7 @@ add_executable(hash-tests
  ${hash_sources}
  ${hash_headers})
 target_link_libraries(hash-tests
-  PRIVATE
+  LINK_PRIVATE
    crypto)
 set_property(TARGET hash-tests
  PROPERTY
--- a/tests/net_load_tests/CMakeLists.txt
+++ b/tests/net_load_tests/CMakeLists.txt
@ -36,7 +36,7 @@ add_executable(net_load_tests_clt
  ${clt_sources}
  ${clt_headers})
 target_link_libraries(net_load_tests_clt
-  PRIVATE
+  LINK_PRIVATE
    ${GTEST_MAIN_LIBRARIES}
    ${Boost_CHRONO_LIBRARY}
    ${Boost_DATE_TIME_LIBRARY}
@ -55,7 +55,7 @@ add_executable(net_load_tests_srv
  ${srv_sources}
  ${srv_headers})
 target_link_libraries(net_load_tests_srv
-  PRIVATE
+  LINK_PRIVATE
    ${GTEST_MAIN_LIBRARIES}
    ${Boost_CHRONO_LIBRARY}
    ${Boost_DATE_TIME_LIBRARY}
--- a/tests/performance_tests/CMakeLists.txt
+++ b/tests/performance_tests/CMakeLists.txt
@ -48,7 +48,7 @@ add_executable(performance_tests
  ${performance_tests_sources}
  ${performance_tests_headers})
 target_link_libraries(performance_tests
-  PRIVATE
+  LINK_PRIVATE
    cryptonote_core
    common
    crypto
--- a/tests/unit_tests/CMakeLists.txt
+++ b/tests/unit_tests/CMakeLists.txt
@ -54,7 +54,7 @@ add_executable(unit_tests
  ${unit_tests_sources}
  ${unit_tests_headers})
 target_link_libraries(unit_tests
-  PRIVATE
+  LINK_PRIVATE
    cryptonote_core
    rpc
    wallet