Merge branch 'master' of https://github.com/PDAL/PDAL

PDAL · Apr 3, 2018 · ff1dc18 · ff1dc18
2 parents 0b881bf + 15aaf6b
commit ff1dc18
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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}")

diff --git 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()