diff options
| author | d3x0r <d3x0r@users.noreply.github.com> | 2017-07-06 23:11:11 -0700 |
|---|---|---|
| committer | d3x0r <d3x0r@users.noreply.github.com> | 2017-07-06 23:11:11 -0700 |
| commit | a4d80ca56acc05b92be6015a50cae3d46f081440 (patch) | |
| tree | 8766676bb4d08cffc7eff748b76c6e0530892b76 /include | |
| parent | 2557dd7439806448ad41b7bc5f175f4ed4f74d9c (diff) | |
| parent | 334245374a084ba175225c209ac9e18af5a60150 (diff) | |
| download | portable-a4d80ca56acc05b92be6015a50cae3d46f081440.tar.gz portable-a4d80ca56acc05b92be6015a50cae3d46f081440.tar.bz2 portable-a4d80ca56acc05b92be6015a50cae3d46f081440.zip | |
Merge branch 'master' of https://github.com/libressl-portable/portable into SkipInstall
Fix merge conflicts from GNUInstallDirs merge to master.
Diffstat (limited to 'include')
| -rw-r--r-- | include/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 870c740..b730954 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | if(ENABLE_LIBRESSL_INSTALL) | 1 | if(ENABLE_LIBRESSL_INSTALL) |
| 2 | install(DIRECTORY . | 2 | install(DIRECTORY . |
| 3 | DESTINATION include | 3 | DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} |
| 4 | PATTERN "CMakeLists.txt" EXCLUDE | 4 | PATTERN "CMakeLists.txt" EXCLUDE |
| 5 | PATTERN "compat" EXCLUDE | 5 | PATTERN "compat" EXCLUDE |
| 6 | PATTERN "Makefile*" EXCLUDE) | 6 | PATTERN "Makefile*" EXCLUDE) |
| 7 | endif(ENABLE_LIBRESSL_INSTALL) | 7 | endif(ENABLE_LIBRESSL_INSTALL) |