Merge pull request #5708 from blowekamp/gdcm_update_output_directory

Conform GDCM to use CMAKE_*OUTPUT_DIRECTORY

Author: blowekamp

Modules/ThirdParty/GDCM/src/CMakeLists.txt

@@ -83,10 +83,6 @@ set(GDCMV2_0_COMPATIBILITY ON CACHE INTERNAL "")
 set(GDCM_WRITE_ODD_LENGTH OFF CACHE INTERNAL "Do not change")
 set(GDCM_DEBUG_POSTFIX "" CACHE INTERNAL "")
 
-# GDCM uses these to refer to executable and library locations
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-set(LIBRARY_OUTPUT_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
-
 add_subdirectory(gdcm)
 
 foreach(

Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt

@@ -118,20 +118,39 @@ if(BUILD_SHARED_LIBS)
 endif()
 
 #-----------------------------------------------------------------------------
-if(NOT EXECUTABLE_OUTPUT_PATH)
-  set(EXECUTABLE_OUTPUT_PATH ${GDCM_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.")
-  mark_as_advanced(EXECUTABLE_OUTPUT_PATH)
+# Compatibility with older usage of EXECUTABLE_OUTPUT_PATH and LIBRARY_OUTPUT_PATH.
+# This should be removed in the future.
+if(EXECUTABLE_OUTPUT_PATH)
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
+  message(WARNING "EXECUTABLE_OUTPUT_PATH is deprecated. Use CMAKE_RUNTIME_OUTPUT_DIRECTORY instead.")
 endif()
-if(NOT LIBRARY_OUTPUT_PATH)
-  set(LIBRARY_OUTPUT_PATH ${GDCM_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.")
-  mark_as_advanced(LIBRARY_OUTPUT_PATH)
+if(LIBRARY_OUTPUT_PATH)
+  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH})
+  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH})
+  message(WARNING "LIBRARY_OUTPUT_PATH is deprecated. Use CMAKE_LIBRARY_OUTPUT_DIRECTORY and CMAKE_ARCHIVE_OUTPUT_DIRECTORY instead.")
 endif()
 
-# TODO: The following should be used for CMake 3 and beyond,
-# EXECUTABLE_OUTPUT_PATH and LIBRARY_OUTPUT_PATH are deprecated
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH})
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH})
+if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
+endif()
+if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
+endif()
+if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
+  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
+endif()
+
+# Set for legacy internal usage of EXECUTABLE_OUTPUT_PATH and LIBRARY_OUTPUT_PATH
+if (NOT EXECUTABLE_OUTPUT_PATH)
+  set(EXECUTABLE_OUTPUT_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+endif()
+if (NOT LIBRARY_OUTPUT_PATH)
+  if (BUILD_SHARED_LIBS)
+    set(LIBRARY_OUTPUT_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+  else()
+    set(LIBRARY_OUTPUT_PATH ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY})
+  endif()
+endif()
 
 #-----------------------------------------------------------------------------
 # Adding GDCM_DATA_ROOT