Pārlūkot izejas kodu

cmake: rather use SHAREDIR than DATADIR define.

DATADIR is a reserved structure name in win32, using it like us here
leads to very nifty compile problems. SHAREDIR is clean.
Klaas Freitag 10 gadi atpakaļ
vecāks
revīzija
6992631c4c
3 mainītis faili ar 6 papildinājumiem un 2 dzēšanām
  1. 4 0
      CMakeLists.txt
  2. 1 1
      config.h.in
  3. 1 1
      src/gui/application.cpp

+ 4 - 0
CMakeLists.txt

@@ -74,6 +74,10 @@ message(STATUS "GIT_SHA1 ${GIT_SHA1}")
 
 set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
 set(DATADIR ${DATA_INSTALL_DIR})
+if(WIN32)
+set(DATADIR "share")
+endif(WIN32)
+set(SHAREDIR ${DATADIR})
 
 #####
 ## handle BUILD_OWNCLOUD_OSX_BUNDLE

+ 1 - 1
config.h.in

@@ -21,7 +21,7 @@
 #cmakedefine ZLIB_FOUND @ZLIB_FOUND@
 
 #cmakedefine SYSCONFDIR "@SYSCONFDIR@"
-#cmakedefine DATADIR "@DATADIR@"
+#cmakedefine SHAREDIR "@SHAREDIR@"
 
 #ifndef NEON_WITH_LFS
 #cmakedefine NEON_WITH_LFS "@NEON_WITH_LFS@"

+ 1 - 1
src/gui/application.cpp

@@ -76,7 +76,7 @@ QString applicationTrPath()
 #elif defined(Q_OS_MAC)
     return QApplication::applicationDirPath()+QLatin1String("/../Resources/Translations"); // path defaults to app dir.
 #elif defined(Q_OS_UNIX)
-    return QString::fromLatin1(DATADIR "/" APPLICATION_EXECUTABLE "/i18n/");
+    return QString::fromLatin1(SHAREDIR "/" APPLICATION_EXECUTABLE "/i18n/");
 #endif
 }
 }