1
0
Fork 0

Windows install: no backslash strings in cmake.

This commit is contained in:
Wilfried Goesgens 2016-08-25 17:35:29 +02:00
parent efc949426f
commit f39ec1c591
3 changed files with 4 additions and 4 deletions

View File

@ -16,8 +16,6 @@ endif ()
set(CMAKE_INSTALL_SYSCONFDIR_ARANGO "${CMAKE_INSTALL_SYSCONFDIR}/arangodb3")
set(CMAKE_INSTALL_FULL_SYSCONFDIR_ARANGO "${CMAKE_INSTALL_FULL_SYSCONFDIR}/arangodb3")
file(TO_NATIVE_PATH "${CMAKE_INSTALL_FULL_SYSCONFDIR_ARANGO}" ETCDIR_NATIVE)
# database directory
FILE(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/var/lib/arangodb3")

View File

@ -1,5 +1,5 @@
#define LOCCAL_STATE_DIR "@CMAKE_INSTALL_FULL_LOCALSTATEDIR@"
#define _SYSCONFDIR_ "@ETCDIR_NATIVE@"
#define _SYSCONFDIR_ "@CMAKE_INSTALL_FULL_SYSCONFDIR_ARANGO@"
#define STARTUP_DIRECTORY "@PKGDATADIR@/js"
#define DESTINATION_DIR "@CMAKE_INSTALL_DATAROOTDIR_ARANGO@/js"
#define ICU_DESTINATION_DIRECTORY "@ICU_DT_DEST@"

View File

@ -325,7 +325,9 @@ void TRI_FixIcuDataEnv() {
putenv(e.c_str());
} else {
#ifdef _SYSCONFDIR_
std::string e = "ICU_DATA=" + std::string(_SYSCONFDIR_) + "..\\..\\bin";
std::string SCDIR(_SYSCONFDIR_)
SCDIR = StringUtils::replace(SCDIR, "/", "\\\\");
std::string e = "ICU_DATA=" + SCDIR + "..\\..\\bin";
e = StringUtils::replace(e, "\\", "\\\\");
putenv(e.c_str());
#else