Add compile-time support for a custom fg-root location, when using CMake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a6d9482985fbbb09efcf6559be981175d2b8046..38309a28d8c3a61b70294be8e34f6d9f13044bd5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,8 +37,12 @@ include (CPack)
 # We have some custom .cmake scripts not in the official distribution.
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeModules;${CMAKE_MODULE_PATH}")
 
-# autoconf compatibility
-set(PKGLIBDIR "foo")
+if (FG_DATA_DIR)
+    message(STATUS "Using explicit data-dir: ${FG_DATA_DIR}")
+else()
+    set(FG_DATA_DIR "${CMAKE_INSTALL_PREFIX}/lib/FlightGear")
+    message(STATUS "Using default data-dir:  ${FG_DATA_DIR}")
+endif()
 
 # Change the default build type to something fast
 if(NOT CMAKE_BUILD_TYPE)

diff --git a/src/Include/config_cmake.h.in b/src/Include/config_cmake.h.in
index 721253db8f2c30ca6a50df0f5ce4a36ca965af8c..2b96a50c75c9195c20813927ef2a00472cfd78f1 100644 (file)
--- a/src/Include/config_cmake.h.in
+++ b/src/Include/config_cmake.h.in
@@ -33,6 +33,6 @@
 #cmakedefine HAVE_SVN_CLIENT_H
 #cmakedefine HAVE_LIBSVN_CLIENT_1
 
-#define PKGLIBDIR "@PKGLIBDIR"
+#define PKGLIBDIR "@FG_DATA_DIR@"
 
 #cmakedefine FG_HAVE_HLA