diff options
| author |  John Maguire | 2010-09-19 15:55:31 +0200 |
|---|---|---|
| committer |  Hector Martin | 2010-09-19 15:55:31 +0200 |
| commit | bbaa8380a2af9130075f907033283761bfe56b5c (patch) | |
| tree | 4474448b9b074e4e82e42c09fae5de6c887f1abe | |
| parent | f8a406e4f4b2627baf37cb2c20e327bc5e62ca87 (diff) | |
| download | usbmuxd-bbaa8380a2af9130075f907033283761bfe56b5c.tar.gz usbmuxd-bbaa8380a2af9130075f907033283761bfe56b5c.tar.bz2 | |
Fixes for building libusbmuxd on OS X
Adds include_directories(${OPT_INCLUDES}) for when libplist isn't in
the default include directories.
Uses /bin/echo instead of sh's echo as "echo -n" does not work on
OS X's sh.
| -rwxr-xr-x | Modules/describe.sh | 6 | ||||
| -rw-r--r-- | daemon/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | libusbmuxd/CMakeLists.txt | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/Modules/describe.sh b/Modules/describe.sh index 91730b8..6425ed5 100755 --- a/Modules/describe.sh +++ b/Modules/describe.sh @@ -2,15 +2,15 @@ # Check for git and a git repo. if head=`git rev-parse --verify HEAD 2>/dev/null`; then - echo -n `git describe` + /bin/echo -n `git describe` # Are there uncommitted changes? git update-index --refresh --unmerged > /dev/null - git diff-index --quiet HEAD || echo -n -dirty + git diff-index --quiet HEAD || /bin/echo -n -dirty else # Check for version tag if [ -e version.tag ]; then - echo -n `cat version.tag` + /bin/echo -n `cat version.tag` fi fi diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt index 103a8fe..c323f7b 100644 --- a/daemon/CMakeLists.txt +++ b/daemon/CMakeLists.txt @@ -1,5 +1,6 @@ find_package(USB REQUIRED) include_directories(${USB_INCLUDE_DIRS}) +include_directories(${OPT_INCLUDES}) set(LIBS ${LIBS} ${USB_LIBRARIES} ${OPT_LIBS}) if(HAVE_PLIST) add_definitions("-DHAVE_PLIST") diff --git a/libusbmuxd/CMakeLists.txt b/libusbmuxd/CMakeLists.txt index c8f2cb4..81203d3 100644 --- a/libusbmuxd/CMakeLists.txt +++ b/libusbmuxd/CMakeLists.txt @@ -11,6 +11,7 @@ endif() if(WIN32) set(OPT_LIBS ${OPT_LIBS} ws2_32) endif() +include_directories(${OPT_INCLUDES}) target_link_libraries (libusbmuxd ${CMAKE_THREAD_LIBS_INIT} ${OPT_LIBS}) # 'lib' is a UNIXism, the proper CMake target is usbmuxd |