[glom] fix



commit 7f7c14ebf04f6d541b1684822b6ffd4d6a260551
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Mar 14 21:42:38 2016 +0100

    fix

 CMakeLists.txt |    8 ++++++--
 README.cmake   |    3 +++
 2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbd2913..69864b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -981,8 +981,12 @@ link_directories(${DEPS_LIBRARY_DIRS})
 
 # Locate the directory containing the PostgreSQL utilities, such as the
 # postmaster executable, so we can self-host PostgreSQL databases.
-# TODO: Do this properly.
-set(POSTGRES_UTILS_PATH "/usr/bin")
+# Note: This is a particularly shocking example of cmake's quoting problem.
+# Note: OUTPUT_STRIP_TRAILING_WHITESPACE is not documented other than being
+# mentioned as a possible option: https://cmake.org/cmake/help/v3.4/command/execute_process.html
+execute_process(COMMAND pg_config --bindir
+        OUTPUT_VARIABLE POSTGRES_UTILS_PATH
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 
 # Locate the directory containing the MySQL utilities, such as the
diff --git a/README.cmake b/README.cmake
new file mode 100644
index 0000000..ae63b56
--- /dev/null
+++ b/README.cmake
@@ -0,0 +1,3 @@
+This project uses autotools, providing the regular configure/make build steps.
+
+You can also use CMake, but that's very experimental so far.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]