Changeset: 08642a95f3e5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=08642a95f3e5
Modified Files:
CMakeLists.txt
monetdb_config.h.in
Branch: cmake-fun
Log Message:
GNUInstallDirs is broken on Windows.
diffs (120 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,6 @@ include(CMakePushCheckState REQUIRED)
include(CheckStructHasMember REQUIRED)
include(CheckSymbolExists REQUIRED)
include(CheckTypeSize REQUIRED)
-include(GNUInstallDirs REQUIRED)
include(TestBigEndian REQUIRED)
include(TestLargeFiles REQUIRED)
@@ -178,21 +177,37 @@ set(SOURCE "${CMAKE_SOURCE_DIR}")
set(PREFIX "${CMAKE_INSTALL_PREFIX}")
set(EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
-set(BINDIR "${CMAKE_INSTALL_FULL_BINDIR}")
-set(DATADIR "${CMAKE_INSTALL_FULL_DATADIR}")
-set(DATAROOTDIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}")
-set(DATA_DIR "${CMAKE_INSTALL_FULL_DATADIR}")
-set(INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
-set(INFODIR "${CMAKE_INSTALL_FULL_INFODIR}")
-set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
-set(LIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}")
-set(LOCALSTATEDIR "${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(PKGCONFIGDIR "${LIBDIR}/pkgconfig")
-set(RUNDIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/run/monetdb" CACHE PATH "Where
to put pid files (LOCALSTATEDIR/run/monetdb)")
-set(SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}")
-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
+if(WIN32)
+ set(BINDIR "${CMAKE_INSTALL_PREFIX}/bin")
+ set(BIN_DIR "${CMAKE_INSTALL_PREFIX}\\\\bin")
+ set(DATADIR "${CMAKE_INSTALL_PREFIX}/share")
+ set(DATA_DIR "${CMAKE_INSTALL_PREFIX}\\\\share")
+ set(INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include")
+ set(LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
+ set(LIB_DIR "${CMAKE_INSTALL_PREFIX}\\\\lib")
+ set(LOCALSTATEDIR "${CMAKE_INSTALL_PREFIX}/var")
+ set(LOCALSTATE_DIR "${CMAKE_INSTALL_PREFIX}\\\\var")
+else()
+ include(GNUInstallDirs REQUIRED)
+ set(BINDIR "${CMAKE_INSTALL_FULL_BINDIR}")
+ set(BIN_DIR "${CMAKE_INSTALL_FULL_BINDIR}")
+ set(DATADIR "${CMAKE_INSTALL_FULL_DATADIR}")
+ set(DATA_DIR "${CMAKE_INSTALL_FULL_DATADIR}")
+ set(DATAROOTDIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}")
+ set(INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
+ set(INFODIR "${CMAKE_INSTALL_FULL_INFODIR}")
+ set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
+ set(LIB_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
+ 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}")
+ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
+ set(PKGCONFIGDIR "${LIBDIR}/pkgconfig")
+endif()
set(PROGRAM_PERMISSIONS_DEFAULT OWNER_WRITE OWNER_READ OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
@@ -735,11 +750,9 @@ endif()
if(WIN32)
set(OS_DIRSEP "\\\\")
set(OS_PATHSEP ";")
- set(SO_PREFIX "")
elseif(UNIX OR APPLE OR ${CMAKE_SYSTEM_NAME} STREQUAL "CYGWIN")
set(OS_DIRSEP "/")
set(OS_PATHSEP ":")
- set(SO_PREFIX ${CMAKE_SHARED_LIBRARY_PREFIX})
else()
message(FATAL_ERROR "Unknown target operating system")
endif()
@@ -748,7 +761,8 @@ set(DIR_SEP "'${OS_DIRSEP}'")
set(DIR_SEP_STR ${OS_DIRSEP})
set(PATH_SEP "'${OS_PATHSEP}'")
set(PATH_SEP_STR ${OS_PATHSEP})
-set(SO_EXT ${CMAKE_SHARED_LIBRARY_SUFFIX})
+set(SO_PREFIX "${CMAKE_SHARED_LIBRARY_PREFIX}")
+set(SO_EXT "${CMAKE_SHARED_LIBRARY_SUFFIX}")
test_big_endian(WORDS_BIGENDIAN)
if(APPLE)
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -72,7 +72,7 @@
#cmakedefine AC_APPLE_UNIVERSAL_BUILD
/* location where binaries are installed */
-#cmakedefine BINDIR "@BINDIR@"
+#cmakedefine BINDIR "@BIN_DIR@"
/* read-only architecture-independent data */
#cmakedefine DATA_DIR "@DATA_DIR@"
@@ -559,10 +559,10 @@
#cmakedefine LENP_OR_POINTER_T @LENP_OR_POINTER_T@
/* location where libraries are installed */
-#cmakedefine LIBDIR "@LIBDIR@"
+#cmakedefine LIBDIR "@LIB_DIR@"
/* modifiable single-machine data */
-#cmakedefine LOCALSTATEDIR "@LOCALSTATEDIR@"
+#cmakedefine LOCALSTATEDIR "@LOCALSTATE_DIR@"
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
@@ -649,7 +649,7 @@
#cmakedefine SO_EXT "@SO_EXT@"
/* Shared Object prefix */
-#cmakedefine SO_PREFIX "@SO_PREFIX@"
+#define SO_PREFIX "@SO_PREFIX@"
/* Compiling for static code analysis */
#cmakedefine STATIC_CODE_ANALYSIS
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
