diff options
| author | Vincent Richard <[email protected]> | 2016-03-25 07:25:43 +0000 |
|---|---|---|
| committer | Vincent Richard <[email protected]> | 2016-03-25 07:25:43 +0000 |
| commit | fed1469adef18ed658282c529fe957fa7a8c5fce (patch) | |
| tree | 53dd04d062f4a143b8660ccc4c6b7b27f5816f22 | |
| parent | Fixed special value 'last' in message sets. (diff) | |
| download | vmime-fed1469adef18ed658282c529fe957fa7a8c5fce.tar.gz vmime-fed1469adef18ed658282c529fe957fa7a8c5fce.zip | |
Fixed location of config and lib export include files.
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | CMakeLists.txt | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 2b5b0f1f..eb3ada82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,8 +30,8 @@ script: - cd _build - cmake .. -DCMAKE_INSTALL_PREFIX=../_install $OPTIONS - cmake .. -L - - cat ../src/vmime/config.hpp - - cat ../src/vmime/export-shared.hpp - - cat ../src/vmime/export-static.hpp + - cat ./src/vmime/config.hpp + - cat ./src/vmime/export-shared.hpp + - cat ./src/vmime/export-static.hpp - cmake --build . --target install - ctest diff --git a/CMakeLists.txt b/CMakeLists.txt index 38d7d15e..797a383e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,10 +118,10 @@ IF(VMIME_BUILD_SHARED_LIBRARY) COPY ${CMAKE_CURRENT_BINARY_DIR}/export-shared.hpp DESTINATION - ${PROJECT_SOURCE_DIR}/src/vmime + ${CMAKE_BINARY_DIR}/src/vmime ) - LIST(APPEND VMIME_LIBRARY_GENERATED_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/vmime/export-shared.hpp") + LIST(APPEND VMIME_LIBRARY_GENERATED_INCLUDE_FILES "${CMAKE_BINARY_DIR}/src/vmime/export-shared.hpp") SET_TARGET_PROPERTIES( ${VMIME_LIBRARY_NAME} @@ -163,10 +163,10 @@ IF(VMIME_BUILD_STATIC_LIBRARY) COPY ${CMAKE_CURRENT_BINARY_DIR}/export-static.hpp DESTINATION - ${PROJECT_SOURCE_DIR}/src/vmime + ${CMAKE_BINARY_DIR}/src/vmime ) - LIST(APPEND VMIME_LIBRARY_GENERATED_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/vmime/export-static.hpp") + LIST(APPEND VMIME_LIBRARY_GENERATED_INCLUDE_FILES "${CMAKE_BINARY_DIR}/src/vmime/export-static.hpp") SET_TARGET_PROPERTIES( ${VMIME_LIBRARY_NAME}-static |