This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch upstream/latest
in repository colobot.
commit 56393f427832c1aeb5c0499b5a80a1e86cfec6b2
Author: MBlanc <manuel.bl...@estudiante.uam.es>
Date: Fri Dec 12 00:50:42 2014 +0100
Modified CMake to search the path for libintl headers
Conflicts:
src/CMakeLists.txt
---
src/CMakeLists.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 013c4e0..5a9e49f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -34,7 +34,8 @@ elseif(PLATFORM_LINUX)
# for clock_gettime
set(PLATFORM_LIBS "-lrt -lX11")
elseif(PLATFORM_MACOSX)
- find_library(LIBINTL_LIBRARY NAMES intl libintl )
+ find_library(LIBINTL_LIBRARY NAMES intl libintl)
+ find_path(LIBINTL_INCLUDE_PATH NAMES libintl.h)
set(PLATFORM_LIBS ${LIBINTL_LIBRARY})
endif()
@@ -241,6 +242,7 @@ set(SYSTEM_INCLUDES
${OPTIONAL_INCLUDE_DIRS}
${CLIPBOARD_INCLUDE_DIR}
${PHYSFS_INCLUDE_PATH}
+ ${LIBINTL_INCLUDE_PATH}
)
set(COLOBOT_LOCAL_INCLUDES ${LOCAL_INCLUDES} PARENT_SCOPE)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/colobot.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
