From d3f636ece0ab60e2b8edc8648fa05e83338b60c6 Mon Sep 17 00:00:00 2001
From: Peter Wu <peter@lekensteyn.nl>
Date: Sat, 14 Oct 2017 20:13:52 +0100
Subject: cmake: fix CMP0026 deprecation warning in CMake 3.9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since CMake 3.9, all policies before CMP0036 emit a warning. Fix the
warning by not relying on the old behavior (existence of the LOCATION
property).

Tested with Ninja, the cmake output, rules.ninja and build.ninja output
is identical (minus the deprecation warning).

Change-Id: I058699380b01a9c02d9b98fd485ce6ded427abe3
Reviewed-on: https://code.wireshark.org/review/23915
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
---
 epan/CMakeLists.txt | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'epan/CMakeLists.txt')

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index b5d1d2a20b..8f6c2ee975 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -331,13 +331,6 @@ set_source_files_properties(
 	COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
 )
 
-# Cannot use $<$<BOOL:${HAVE_LIBLUA}>:$<TARGET_OBJECTS:wslua>> as that breaks
-# get_target_property(_libwireshark_location epan LOCATION).
-if(HAVE_LIBLUA)
-	set(wslua_sources $<TARGET_OBJECTS:wslua>)
-else()
-	set(wslua_sources)
-endif()
 add_library(epan ${LINK_MODE_LIB}
 	${LIBWIRESHARK_FILES}
 	${GENERATED_FILES}
@@ -349,7 +342,7 @@ add_library(epan ${LINK_MODE_LIB}
 	$<TARGET_OBJECTS:dissectors-corba>
 	$<TARGET_OBJECTS:ftypes>
 	$<TARGET_OBJECTS:wmem>
-	${wslua_sources}
+	$<$<BOOL:${HAVE_LIBLUA}>:$<TARGET_OBJECTS:wslua>>
 	${CMAKE_BINARY_DIR}/image/libwireshark.rc
 )
 
-- 
cgit v1.2.3