diff options
| author | Patrick Reynolds <cpreynolds@gmail.com> | 2009-08-18 23:05:58 -0400 |
|---|---|---|
| committer | Lars-Dominik Braun <PromyLOPh@lavabit.com> | 2009-08-19 17:35:38 +0200 |
| commit | feafdcc8a12c57bd98168b11c0006f1eb5eeb0ba (patch) | |
| tree | 9dd79d57bbf4f972bb351ab688bda5aa02d52dcd | |
| parent | 0b78ef85100978c6c32a0815b5b8544b72f05c52 (diff) | |
| download | pianobar-feafdcc8a12c57bd98168b11c0006f1eb5eeb0ba.tar.gz pianobar-feafdcc8a12c57bd98168b11c0006f1eb5eeb0ba.tar.bz2 pianobar-feafdcc8a12c57bd98168b11c0006f1eb5eeb0ba.zip | |
Added some cmake code to the project CMakeLists.txt's to include the proper binary directories. Without this code, out-of-source builds do not work.
| -rw-r--r-- | libpiano/src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | libwaitress/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libwardrobe/src/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 1 |
4 files changed, 6 insertions, 1 deletions
diff --git a/libpiano/src/CMakeLists.txt b/libpiano/src/CMakeLists.txt index 54b3ebe..1344be2 100644 --- a/libpiano/src/CMakeLists.txt +++ b/libpiano/src/CMakeLists.txt @@ -4,6 +4,7 @@ configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../../libwaitress/src + ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../libezxml/src) add_library (piano STATIC crypt.c http.c main.c xml.c) diff --git a/libwaitress/src/CMakeLists.txt b/libwaitress/src/CMakeLists.txt index 96ac328..8978a08 100644 --- a/libwaitress/src/CMakeLists.txt +++ b/libwaitress/src/CMakeLists.txt @@ -16,6 +16,8 @@ ENDIF(NOT CMAKE_HAVE_CONNECT) configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) +include_directories( ${CMAKE_CURRENT_BINARY_DIR} ) + add_library (waitress STATIC main.c) target_link_libraries (waitress ${EXTRA_LIBS}) diff --git a/libwardrobe/src/CMakeLists.txt b/libwardrobe/src/CMakeLists.txt index f466103..d6bed82 100644 --- a/libwardrobe/src/CMakeLists.txt +++ b/libwardrobe/src/CMakeLists.txt @@ -3,7 +3,8 @@ set (CMAKE_C_FLAGS -Wall) configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) -include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../../libwaitress/src) +include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../../libwaitress/src + ${CMAKE_CURRENT_BINARY_DIR} ) add_library (wardrobe STATIC main.c md5.c) target_link_libraries (wardrobe waitress) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5ef7c5a..77e4b65 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -59,6 +59,7 @@ include_directories ( ${pianobar_SOURCE_DIR}/libpiano/src ${pianobar_SOURCE_DIR}/libwardrobe/src ${pianobar_SOURCE_DIR}/libwaitress/src + ${CMAKE_CURRENT_BINARY_DIR} ${FAAD_INCLUDE_DIRS} ${LIBAO_INCLUDE_DIRS} ${MAD_INCLUDE_DIRS}) |