Changeset: 6bb5ea7fd9ca for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6bb5ea7fd9ca
Modified Files:
CMakeLists.txt
Branch: cmake-fun
Log Message:
Added missing installation directories for Windows.
diffs (37 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,11 +118,16 @@ if(WIN32) # Variables with _DIR are used
set(BIN_DIR "${TRIMMED_INSTALL_PREFIX}\\\\bin")
set(DATADIR "${CMAKE_INSTALL_PREFIX}/share")
set(DATA_DIR "${TRIMMED_INSTALL_PREFIX}\\\\share")
+ set(DATAROOTDIR "${TRIMMED_INSTALL_PREFIX}/share")
set(INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include")
+ set(INFODIR "${CMAKE_INSTALL_PREFIX}/info")
set(LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
set(LIB_DIR "${TRIMMED_INSTALL_PREFIX}\\\\lib")
+ set(LIBEXECDIR "${CMAKE_INSTALL_PREFIX}/libexec")
set(LOCALSTATEDIR "${CMAKE_INSTALL_PREFIX}/var")
set(LOCALSTATE_DIR "${TRIMMED_INSTALL_PREFIX}\\\\var")
+ set(MANDIR "${TRIMMED_INSTALL_PREFIX}/man")
+ set(SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc")
else()
include(GNUInstallDirs REQUIRED)
set(BINDIR "${CMAKE_INSTALL_FULL_BINDIR}")
@@ -137,12 +142,13 @@ else()
set(LIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}")
set(LOCALSTATEDIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}")
set(LOCALSTATE_DIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}")
- set(LOGDIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/monetdb" CACHE PATH
"Where to put log files (LOCALSTATEDIR/log/monetdb)")
set(MANDIR "${CMAKE_INSTALL_FULL_MANDIR}")
- set(RUNDIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/run/monetdb" CACHE PATH
"Where to put pid files (LOCALSTATEDIR/run/monetdb)")
set(SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}")
+ # Unix only variables
+ set(LOGDIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/monetdb" CACHE PATH
"Where to put log files (default LOCALSTATEDIR/log/monetdb)")
+ set(PKGCONFIGDIR "${LIBDIR}/pkgconfig") # Set a default value for every
installation
+ set(RUNDIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/run/monetdb" CACHE PATH
"Where to put pid files (default LOCALSTATEDIR/run/monetdb)")
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
- set(PKGCONFIGDIR "${LIBDIR}/pkgconfig")
endif()
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
