rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- moved curl lib check to unix scope. 

- moved HAVE_Xi check back into linux scope as a precaution.
This commit is contained in:
Nick Bolton 2014-02-05 16:53:27 +00:00
parent ee87828a9d
commit b8fc718b5a
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -141,6 +141,9 @@ if (UNIX)
message(FATAL_ERROR "Missing library: pthread") message(FATAL_ERROR "Missing library: pthread")
endif() endif()
find_library(lib_CURL CURL)
list(APPEND libs ${lib_CURL})
if (APPLE) if (APPLE)
exec_program(uname ARGS -v OUTPUT_VARIABLE DARWIN_VERSION) exec_program(uname ARGS -v OUTPUT_VARIABLE DARWIN_VERSION)
string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION}) string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION})
@ -163,15 +166,12 @@ if (UNIX)
find_library(lib_ApplicationServices ApplicationServices) find_library(lib_ApplicationServices ApplicationServices)
find_library(lib_Foundation Foundation) find_library(lib_Foundation Foundation)
find_library(lib_Carbon Carbon) find_library(lib_Carbon Carbon)
find_library(lib_CURL CURL)
list(APPEND libs list(APPEND libs
${lib_ScreenSaver} ${lib_ScreenSaver}
${lib_IOKit} ${lib_IOKit}
${lib_ApplicationServices} ${lib_ApplicationServices}
${lib_Foundation} ${lib_Foundation
${lib_Carbon}
${lib_CURL}
) )
else() else()
@ -243,11 +243,13 @@ if (UNIX)
list(APPEND libs Xrandr) list(APPEND libs Xrandr)
endif() endif()
endif() # this was outside of the linux scope,
# not sure why, moving it back inside.
if(HAVE_Xi)
list(APPEND libs Xi)
endif()
IF(HAVE_Xi) endif()
LIST(APPEND libs Xi)
ENDIF()
# For config.h, set some static values; it may be a good idea to make # For config.h, set some static values; it may be a good idea to make
# these values dynamic for non-standard UNIX compilers. # these values dynamic for non-standard UNIX compilers.