Fix CMake warning about CMP0022 policy being set as "OLD".

develop
Ben Lubar 2018-03-08 02:28:28 -06:00
parent 0e7ab27850
commit acd4adc7cc
No known key found for this signature in database
GPG Key ID: 018BAB45DB2D2B24
2 changed files with 4 additions and 6 deletions

@ -1,10 +1,8 @@
PROJECT (dfapi)
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 2.8.12)
# prevent CMake warnings about INTERFACE_LINK_LIBRARIES vs LINK_INTERFACE_LIBRARIES
IF(CMAKE_VERSION VERSION_GREATER "2.8.12")
CMAKE_POLICY(SET CMP0022 OLD)
ENDIF()
CMAKE_POLICY(SET CMP0022 NEW)
## build options
OPTION(BUILD_DEVEL "Install/package files required for development (For SDK)." OFF)
@ -365,7 +363,7 @@ IF(APPLE)
ENDIF()
TARGET_LINK_LIBRARIES(dfhack protobuf-lite clsocket lua jsoncpp dfhack-version ${PROJECT_LIBS})
SET_TARGET_PROPERTIES(dfhack PROPERTIES LINK_INTERFACE_LIBRARIES "")
SET_TARGET_PROPERTIES(dfhack PROPERTIES INTERFACE_LINK_LIBRARIES "")
TARGET_LINK_LIBRARIES(dfhack-client protobuf-lite clsocket)
TARGET_LINK_LIBRARIES(dfhack-run dfhack-client)

@ -1 +1 @@
Subproject commit 031bf4caafec321dd315202a83539d052ed49d84
Subproject commit 5482849c52dfac9f8200af3827d16bfb3fabb899