Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1705 from tomoyat1/freebsd-iconv 

Add iconv library detection by using code for macOS
This commit is contained in:
Emmanuel Lepage Vallée 2017-04-04 16:23:18 -04:00 committed by GitHub
parent c183588ba1 2bb07343c6
commit 262fc626bf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
awesomeConfig.cmake
View File

@ -160,11 +160,11 @@ endforeach()
# Do it again, but this time with the CFLAGS/LDFLAGS # Do it again, but this time with the CFLAGS/LDFLAGS
pkg_check_modules(AWESOME_REQUIRED REQUIRED ${AWESOME_DEPENDENCIES}) pkg_check_modules(AWESOME_REQUIRED REQUIRED ${AWESOME_DEPENDENCIES})
# On Mac OS X, the executable of Awesome has to be linked against libiconv # On Mac OS X and FreeBSD, the executable of Awesome has to be linked against libiconv
# explicitly. Unfortunately, libiconv doesn't have its pkg-config file, # explicitly. Unfortunately, libiconv doesn't have its pkg-config file,
# and CMake doesn't provide a module for looking up the library. Thus, we # and CMake doesn't provide a module for looking up the library. Thus, we
# have to do everything for ourselves... # have to do everything for ourselves...
if(APPLE) if(APPLE OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
if(NOT DEFINED AWESOME_ICONV_SEARCH_PATHS) if(NOT DEFINED AWESOME_ICONV_SEARCH_PATHS)
set(AWESOME_ICONV_SEARCH_PATHS /opt/local /opt /usr/local /usr) set(AWESOME_ICONV_SEARCH_PATHS /opt/local /opt /usr/local /usr)
endif() endif()
@ -195,7 +195,7 @@ if(APPLE)
${AWESOME_REQUIRED_LDFLAGS} ${AWESOME_ICONV_LIBRARY_PATH}) ${AWESOME_REQUIRED_LDFLAGS} ${AWESOME_ICONV_LIBRARY_PATH})
set(AWESOME_REQUIRED_INCLUDE_DIRS set(AWESOME_REQUIRED_INCLUDE_DIRS
${AWESOME_REQUIRED_INCLUDE_DIRS} ${AWESOME_ICONV_INCLUDE_DIR}) ${AWESOME_REQUIRED_INCLUDE_DIRS} ${AWESOME_ICONV_INCLUDE_DIR})
endif(APPLE) endif(APPLE OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
macro(a_find_library variable library) macro(a_find_library variable library)
find_library(${variable} ${library}) find_library(${variable} ${library})