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 /CMakeLists.txt | |
| 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 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bfd1363..959edb7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -6,6 +6,7 @@ include(CheckTypeSize) | |||
| 6 | 6 | ||
| 7 | set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" ${CMAKE_MODULE_PATH}) | 7 | set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" ${CMAKE_MODULE_PATH}) |
| 8 | include(cmake_export_symbol) | 8 | include(cmake_export_symbol) |
| 9 | include(GNUInstallDirs) | ||
| 9 | 10 | ||
| 10 | project (LibreSSL C) | 11 | project (LibreSSL C) |
| 11 | 12 | ||