diff options
| author | Adam <Adam@anope.org> | 2010-10-30 20:12:52 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2010-10-30 20:12:52 -0400 |
| commit | 98bdd9749a0e7d8d9e34d584233c99533066aa26 (patch) | |
| tree | 63c0b0c238ddf7ac00119c0fa239b790d486d743 /cmake | |
| parent | cd21bd758c9b5912953e93fa58ff111aab759b54 (diff) | |
Fixed build on cmake2.6
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindGettext.cmake | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/cmake/FindGettext.cmake b/cmake/FindGettext.cmake index c46c7ec20..78be1c634 100644 --- a/cmake/FindGettext.cmake +++ b/cmake/FindGettext.cmake @@ -3,6 +3,9 @@ if(NOT WIN32) find_path(GETTEXT_INCLUDE libintl.h /usr/include /usr/local/include ${EXTRA_INCLUDE}) find_library(GETTEXT_LIBRARY intl PATHS /usr/lib /usr/lib64 ${EXTRA_INCLUDE}) find_program(GETTEXT_MSGFMT msgfmt PATHS /usr/bin/ /usr/local/bin ${EXTRA_INCLUDE}) + if(GETTEXT_INCLUDE AND GETTEXT_MSGFMT) + set(GETTEXT_FOUND TRUE) + endif(GETTEXT_INCLUDE AND GETTEXT_MSGFMT) else(NOT WIN32) find_path(GETTEXT_INCLUDE libintl.h ${DEFAULT_INCLUDE_DIRS} ${WSDK_PATH}/include $ENV{VCINSTALLDIR}/include gettext/include ${EXTRA_INCLUDE}) find_library(GETTEXT_LIBRARY libintl PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib gettext/lib ${EXTRA_INCLUDE}) @@ -10,11 +13,13 @@ else(NOT WIN32) find_library(MINGWEX_LIBRARY libmingwex PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib gettext/lib ${EXTRA_INCLUDE}) find_library(GCC_LIBRARY libgcc PATHS ${DEFAULT_LIBRARY_DIRS} ${WSDK_PATH}/lib $ENV{VCINSTALLDIR}/lib gettext/lib ${EXTRA_INCLUDE}) find_program(GETTEXT_MSGFMT msgfmt PATHS ${DEFAULT_INCLUDE_DIRS} ${WSDK_PATH}/bin $ENV{VCINSTALLDIR}/bin gettext/bin ${EXTRA_INCLUDE}) + if(GETTEXT_INCLUDE AND GETTEXT_MSGFMT AND ICONV_LIBRARY AND MINGWEX_LIBRARY AND GCC_LIBRARY) + set(GETTEXT_FOUND TRUE) + endif(GETTEXT_INCLUDE AND GETTEXT_MSGFMT AND ICONV_LIBRARY AND MINGWEX_LIBRARY AND GCC_LIBRARY) endif(NOT WIN32) # If we found everything we need set variables correctly for lang/CMakeLists.txt to use -if(GETTEXT_INCLUDE AND GETTEXT_MSGFMT AND (NOT WIN32 OR (ICONV_LIBRARY AND MINGWEX_LIBRARY AND GCC_LIBRARY))) - set(GETTEXT_FOUND TRUE) +if(GETTEXT_FOUND) set(LIBINTL_INCLUDE "${GETTEXT_INCLUDE}/libintl.h") set(GETTEXT_MSGFMT_EXECUTABLE ${GETTEXT_MSGFMT}) @@ -25,4 +30,4 @@ if(GETTEXT_INCLUDE AND GETTEXT_MSGFMT AND (NOT WIN32 OR (ICONV_LIBRARY AND MINGW set(GETTEXT_LIBRARIES ${GETTEXT_LIBRARY}) endif(GETTEXT_LIBRARY) endif(WIN32) -endif(GETTEXT_INCLUDE AND GETTEXT_MSGFMT AND (NOT WIN32 OR (ICONV_LIBRARY AND MINGWEX_LIBRARY AND GCC_LIBRARY))) +endif(GETTEXT_FOUND) |