From b6cd0e98eac31ef5cd1bc99db458ec843aeedd3c Mon Sep 17 00:00:00 2001 From: clemahieu Date: Mon, 31 Jul 2017 12:03:00 -0500 Subject: [PATCH] Moving setting property before usage. --- CMakeLists.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a5e198e2..53bf92f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -208,6 +208,10 @@ add_library (node rai/node/working.hpp rai/node/xorshift.hpp) + +SET (ACTIVE_NETWORK rai_live_network CACHE STRING "Selects which network parameters are used") +set_property (CACHE ACTIVE_NETWORK PROPERTY STRINGS rai_test_network rai_beta_network rai_live_network) + if (RAIBLOCKS_TEST) add_executable (core_test rai/core_test/block.cpp @@ -232,16 +236,11 @@ if (RAIBLOCKS_TEST) add_executable (slow_test rai/slow_test/node.cpp) - - SET (ACTIVE_NETWORK rai_test_network CACHE STRING "Selects which network parameters are used") set_target_properties (core_test slow_test PROPERTIES COMPILE_FLAGS "${PLATFORM_CXX_FLAGS} ${PLATFORM_COMPILE_FLAGS} -DQT_NO_KEYWORDS -DACTIVE_NETWORK=${ACTIVE_NETWORK} -DRAIBLOCKS_VERSION_MAJOR=${CPACK_PACKAGE_VERSION_MAJOR} -DRAIBLOCKS_VERSION_MINOR=${CPACK_PACKAGE_VERSION_MINOR} -DBOOST_ASIO_HAS_STD_ARRAY=1 -DRAIBLOCKS_VERSION_PATCH=${CPACK_PACKAGE_VERSION_PATCH}") set_target_properties (core_test slow_test PROPERTIES LINK_FLAGS "${PLATFORM_LINK_FLAGS}") endif (RAIBLOCKS_TEST) -SET (ACTIVE_NETWORK rai_live_network CACHE STRING "Selects which network parameters are used") -set_property (CACHE ACTIVE_NETWORK PROPERTY STRINGS rai_test_network rai_beta_network rai_live_network) - if (RAIBLOCKS_GUI) qt5_add_resources(RES resources.qrc)