[geos-commits] [SCM] GEOS branch master updated. e5d9a6893d92c89b850b13328bbbaea4ac6fb311

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, master has been updated
       via  e5d9a6893d92c89b850b13328bbbaea4ac6fb311 (commit)
      from  7e4ffa5d1ebab6d61994846a95e66a1c811c868c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e5d9a6893d92c89b850b13328bbbaea4ac6fb311
Author: Mateusz Łoskot <mateusz at loskot.net>
Date:   Fri May 24 09:47:50 2019 +0200

    Point CMAKE_*_OUTPUT_DIRECTORY to common location
    
    Place executables and shared libraries in the same location for
    convenience of direct execution from common spot and for
    convenience in environments without RPATH support.
    
    In future, if number of generated executables grows significantly,
    with possible name clashes, it may be more convenient to replace
    the common locations with setting PATH per test, on Windows only:
    
      set_tests_properties(<test name> PROPERTIES
        ENVIRONMENT
          "PATH=$<SHELL_PATH:$<TARGET_FILE_DIR:geos>>$<SEMICOLON>$<TARGET_FILE_DIR:geos_c>>$<SEMICOLON>$ENV{PATH}"
      )

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2937297..388ffbf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,6 +43,18 @@ cmake_dependent_option(GEOS_BUILD_DEVELOPER
 mark_as_advanced(GEOS_BUILD_DEVELOPER)
 
 #-----------------------------------------------------------------------------
+# Setup build directories
+#-----------------------------------------------------------------------------
+# Place executables and shared libraries in the same location for
+# convenience of direct execution from common spot and for
+# convenience in environments without RPATH support.
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+message(STATUS "GEOS: Run-time output: ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
+message(STATUS "GEOS: Archives output: ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
+
+#-----------------------------------------------------------------------------
 # Version
 #-----------------------------------------------------------------------------
 file(READ Version.txt _version_txt)

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt | 12 ++++++++++++
 1 file changed, 12 insertions(+)


hooks/post-receive
-- 
GEOS