- updated cmake to output more info regarding finding libircclient and better support for ircclcient
- cleanup too many exclamations in finding ftgl libs
This commit is contained in:
parent
75dbf96730
commit
b8357b8696
|
@ -19,11 +19,11 @@ ENDIF()
|
||||||
|
|
||||||
IF (FTGL_LIBRARY AND FTGL_INCLUDE_DIR)
|
IF (FTGL_LIBRARY AND FTGL_INCLUDE_DIR)
|
||||||
SET(FTGL_FOUND "YES")
|
SET(FTGL_FOUND "YES")
|
||||||
message(STATUS "!!!!!!!!!!!!!!!!!!!!!!!!!!!!! FTGL lib ALREADY FOUND in: [${FTGL_LIBRARY}]")
|
message(STATUS "** FTGL lib ALREADY FOUND in: [${FTGL_LIBRARY}]")
|
||||||
ELSE (FTGL_LIBRARY AND FTGL_INCLUDE_DIR)
|
ELSE (FTGL_LIBRARY AND FTGL_INCLUDE_DIR)
|
||||||
|
|
||||||
IF(FTGL_LIBRARY_PATH)
|
IF(FTGL_LIBRARY_PATH)
|
||||||
message(STATUS "!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Searching for FTGL lib in custom path: [${FTGL_LIBRARY_PATH}]")
|
message(STATUS "** Searching for FTGL lib in custom path: [${FTGL_LIBRARY_PATH}]")
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
FIND_PATH(FTGL_INCLUDE_DIR FTGL/ftgl.h
|
FIND_PATH(FTGL_INCLUDE_DIR FTGL/ftgl.h
|
||||||
|
|
|
@ -39,8 +39,18 @@ FIND_PATH(IRCCLIENT_INCLUDE_DIR libircclient.h
|
||||||
/opt
|
/opt
|
||||||
)
|
)
|
||||||
|
|
||||||
|
SET(IRCCLIENT_FIND_LIBRARIES ircclient)
|
||||||
|
|
||||||
|
OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF)
|
||||||
|
OPTION(FORCE_IRCCLIENT_DYNAMIC_LIBS "force the use of dynamic libs for IRCCLIENT" OFF)
|
||||||
|
MESSAGE(STATUS "Force IRCCLient dynamic: ${FORCE_IRCCLIENT_DYNAMIC_LIBS}")
|
||||||
|
|
||||||
|
IF(WANT_STATIC_LIBS AND NOT FORCE_IRCCLIENT_DYNAMIC_LIBS)
|
||||||
|
SET(IRCCLIENT_FIND_LIBRARIES libircclient.a)
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
FIND_LIBRARY(IRCCLIENT_LIBRARY
|
FIND_LIBRARY(IRCCLIENT_LIBRARY
|
||||||
NAMES ircclient
|
NAMES ${IRCCLIENT_FIND_LIBRARIES}
|
||||||
HINTS
|
HINTS
|
||||||
$ENV{IRCCLIENTDIR}
|
$ENV{IRCCLIENTDIR}
|
||||||
PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
|
PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
|
||||||
|
@ -59,6 +69,16 @@ FIND_LIBRARY(IRCCLIENT_LIBRARY
|
||||||
# handle the QUIETLY and REQUIRED arguments and set IRCCLIENT_FOUND to TRUE if
|
# handle the QUIETLY and REQUIRED arguments and set IRCCLIENT_FOUND to TRUE if
|
||||||
# all listed variables are TRUE
|
# all listed variables are TRUE
|
||||||
INCLUDE(FindPackageHandleStandardArgs)
|
INCLUDE(FindPackageHandleStandardArgs)
|
||||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(IRCCLIENT DEFAULT_MSG IRCCLIENT_LIBRARY IRCCLIENT_INCLUDE_DIR)
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(IRCCLIENT DEFAULT_MSG IRCCLIENT_LIBRARY IRCCLIENT_INCLUDE_DIR)
|
||||||
|
|
||||||
|
IF(IRCCLIENT_FOUND)
|
||||||
|
|
||||||
|
MESSAGE(STATUS "Found IRCClient include path: ${IRCCLIENT_INCLUDE_DIR} libs: ${IRCCLIENT_LIBRARY}")
|
||||||
|
|
||||||
|
ELSE()
|
||||||
|
|
||||||
|
MESSAGE(STATUS "**** WARNING: IRCClient NOT FOUND include path: ${IRCCLIENT_INCLUDE_DIR} libs: ${IRCCLIENT_LIBRARY}")
|
||||||
|
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
MARK_AS_ADVANCED(IRCCLIENT_LIBRARY IRCCLIENT_INCLUDE_DIR)
|
MARK_AS_ADVANCED(IRCCLIENT_LIBRARY IRCCLIENT_INCLUDE_DIR)
|
||||||
|
|
|
@ -361,10 +361,10 @@ option(ENABLE_FRIBIDI "Enable FriBIDi support" ON)
|
||||||
option(DISABLE_IRCCLIENT "Disable libircclient support" OFF)
|
option(DISABLE_IRCCLIENT "Disable libircclient support" OFF)
|
||||||
|
|
||||||
IF(NOT DISABLE_IRCCLIENT)
|
IF(NOT DISABLE_IRCCLIENT)
|
||||||
IF(NOT WANT_STATIC_LIBS)
|
#IF(NOT WANT_STATIC_LIBS)
|
||||||
MESSAGE(STATUS "*** Searching for libircclient since WANT_STATIC_LIBS is off ...")
|
MESSAGE(STATUS "*** Searching for libircclient since WANT_STATIC_LIBS is: ${WANT_STATIC_LIBS} ...")
|
||||||
FIND_PACKAGE(Ircclient)
|
FIND_PACKAGE(Ircclient)
|
||||||
ENDIF()
|
#ENDIF()
|
||||||
|
|
||||||
if(NOT IRCCLIENT_FOUND)
|
if(NOT IRCCLIENT_FOUND)
|
||||||
MESSAGE(STATUS "*** Using EMBEDDED libircclient since this system does not have it... IRCCLIENT_FOUND [${IRCCLIENT_FOUND}]")
|
MESSAGE(STATUS "*** Using EMBEDDED libircclient since this system does not have it... IRCCLIENT_FOUND [${IRCCLIENT_FOUND}]")
|
||||||
|
|
Loading…
Reference in New Issue