From 3c66b820ef87c933cfaec39b06a96112f91eca84 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 3 Apr 2018 13:18:37 -0500 Subject: [PATCH 1/2] default to new cmake policy for interface link libraries (CMP0022) (#1890) --- cmake/policies.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/policies.cmake b/cmake/policies.cmake index e968597728..12bc5d5c1e 100644 --- a/cmake/policies.cmake +++ b/cmake/policies.cmake @@ -2,6 +2,6 @@ # cmake policies # if (CMAKE_MAJOR_VERSION GREATER 2) - cmake_policy(SET CMP0022 OLD) # interface link libraries + cmake_policy(SET CMP0022 NEW) # interface link libraries cmake_policy(SET CMP0042 NEW) # osx rpath endif() From ec30308e45f89f70b5fe677b44f6f3123f3ce6b8 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 3 Apr 2018 14:06:17 -0500 Subject: [PATCH 2/2] PDAL_PLUGIN_INSTALL_PATH is bin not lib on windows --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 39b2072d4b..a6d207a310 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,11 @@ set(PDAL_OUTPUT_BIN_DIR "${PDAL_BINARY_DIR}/${PDAL_BIN_INSTALL_DIR}") # allow override of PDAL_PLUGIN_INSTALL_PATH path if (NOT PDAL_PLUGIN_INSTALL_PATH) - set(PDAL_PLUGIN_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/${PDAL_LIB_INSTALL_DIR}") + if (WIN32) + set(PDAL_PLUGIN_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/${PDAL_BIN_INSTALL_DIR}") + else() + set(PDAL_PLUGIN_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/${PDAL_LIB_INSTALL_DIR}") + endif() endif() file(MAKE_DIRECTORY "${PDAL_OUTPUT_LIB_DIR}") file(MAKE_DIRECTORY "${PDAL_OUTPUT_BIN_DIR}")