Changeset: 6b62ded910cb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6b62ded910cb
Modified Files:
cmake/monetdb-defines.cmake
monetdb_config.h.in
Branch: Oct2020
Log Message:
Removed unused cmake variables {BIN,DATA,LIB}_DIR.
diffs (41 lines):
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -206,7 +206,6 @@ macro(monetdb_macro_variables)
set(BINDIR "${CMAKE_INSTALL_FULL_BINDIR}")
set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
set(DATADIR "${CMAKE_INSTALL_FULL_DATADIR}")
- set(DATA_DIR "${CMAKE_INSTALL_FULL_DATADIR}")
set(LOCALSTATEDIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}")
if(WIN32)
# Fix cmake conversions
@@ -219,10 +218,8 @@ macro(monetdb_macro_variables)
endif()
set(DATAROOTDIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}")
- set(BIN_DIR "${CMAKE_INSTALL_FULL_BINDIR}")
set(INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
set(INFODIR "${CMAKE_INSTALL_FULL_INFODIR}")
- set(LIB_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
set(LIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}")
set(LOCALSTATE_DIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}")
# set(MANDIR "${CMAKE_INSTALL_FULL_MANDIR}")
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -214,15 +214,12 @@
#cmakedefine BINDIR "@BINDIR@"
#cmakedefine LIBDIR "@LIBDIR@"
#cmakedefine DATADIR "@DATADIR@"
-#cmakedefine DATA_DIR "@DATA_DIR@"
#cmakedefine LOCALSTATEDIR "@LOCALSTATEDIR@"
// #cmakedefine QXLOCALSTATEDIR
// #cmakedefine MONETDB_PREFIX
#cmakedefine DATAROOTDIR "@DATAROOTDIR@"
-#cmakedefine BIN_DIR "@BIN_DIR@"
#cmakedefine INCLUDEDIR "@INCLUDEDIR@"
#cmakedefine INFODIR "@INFODIR@"
-#cmakedefine LIB_DIR "@LIB_DIR@"
#cmakedefine LIBEXECDIR "@LIBEXECDIR@"
#cmakedefine LOCALSTATE_DIR "@LOCALSTATE_DIR@"
//#cmakedefine MANDIR "@MANDIR@"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
