diff options
| author | David Walter Seikel | 2013-09-02 16:25:18 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-09-02 16:25:18 +1000 |
| commit | 3091381313fe16afa2f39a92665b4403e9cfc888 (patch) | |
| tree | b12cf32be8fc9055f6830965029c2844457d184e /linden/indra/cmake/libgcrypt.cmake | |
| parent | Merge post fixes so that Linux compiles. (diff) | |
| download | meta-impy-3091381313fe16afa2f39a92665b4403e9cfc888.zip meta-impy-3091381313fe16afa2f39a92665b4403e9cfc888.tar.gz meta-impy-3091381313fe16afa2f39a92665b4403e9cfc888.tar.bz2 meta-impy-3091381313fe16afa2f39a92665b4403e9cfc888.tar.xz | |
More post merge cleanups, make it compile under Windows.
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/cmake/libgcrypt.cmake | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/linden/indra/cmake/libgcrypt.cmake b/linden/indra/cmake/libgcrypt.cmake index 4d19467..19ef1f8 100644 --- a/linden/indra/cmake/libgcrypt.cmake +++ b/linden/indra/cmake/libgcrypt.cmake | |||
| @@ -2,9 +2,19 @@ | |||
| 2 | 2 | ||
| 3 | set(LIBGCRYPT_INCLUDE_DIRS | 3 | set(LIBGCRYPT_INCLUDE_DIRS |
| 4 | ${CMAKE_BINARY_DIR}/libgcrypt/include | 4 | ${CMAKE_BINARY_DIR}/libgcrypt/include |
| 5 | ${LIBS_OPEN_DIR}/libgcrypt/libgcrypt-1.2.2/src | ||
| 5 | ) | 6 | ) |
| 6 | 7 | ||
| 8 | if (DARWIN OR LINUX) | ||
| 7 | set(LIBGCRYPT_LIBRARIES | 9 | set(LIBGCRYPT_LIBRARIES |
| 8 | ${CMAKE_BINARY_DIR}/libgcrypt/lib/libgcrypt.a | 10 | ${CMAKE_BINARY_DIR}/libgcrypt/lib/libgcrypt.a |
| 9 | ) | 11 | ) |
| 12 | endif (DARWIN OR LINUX) | ||
| 10 | 13 | ||
| 14 | if (WINDOWS) | ||
| 15 | set(LIBGCRYPT_LIBRARIES | ||
| 16 | ${CMAKE_BINARY_DIR}/libgcrypt/gcrypt.lib | ||
| 17 | ) | ||
| 18 | endif (WINDOWS) | ||
| 19 | |||
| 20 | add_definitions( /DHAVE_CONFIG_H=1 ) | ||