From: T.E.A de Souza Date: Mon, 19 Oct 2015 10:13:57 +0000 (+0800) Subject: Endorse CMP0046, CMP0054 X-Git-Tag: submit/tizen/20180823.020014~313^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1caaf38370a6dd1bd7bc91fe3b5242ae63be6a22;p=platform%2Fupstream%2Fcaffeonacl.git Endorse CMP0046, CMP0054 Set policies to NEW to silence warnings in CMake 3.02 and later. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 37f937f..82742da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,10 @@ cmake_minimum_required(VERSION 2.8.7) +if(POLICY CMP0046) + cmake_policy(SET CMP0046 NEW) +endif() +if(POLICY CMP0054) + cmake_policy(SET CMP0054 NEW) +endif() # ---[ Caffe project project(Caffe C CXX) @@ -66,8 +72,10 @@ add_subdirectory(docs) add_custom_target(lint COMMAND ${CMAKE_COMMAND} -P ${PROJECT_SOURCE_DIR}/cmake/lint.cmake) # ---[ pytest target -add_custom_target(pytest COMMAND python${python_version} -m unittest discover -s caffe/test WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/python ) -add_dependencies(pytest pycaffe) +if(BUILD_python) + add_custom_target(pytest COMMAND python${python_version} -m unittest discover -s caffe/test WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/python ) + add_dependencies(pytest pycaffe) +endif() # ---[ Configuration summary caffe_print_configuration_summary()