diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2016-07-14 21:58:11 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-14 21:58:11 -0700 |
| commit | 03b5d601058c8d1a2121ff1f6e874a84a4a96a51 (patch) | |
| tree | 0700213ca71b18b4b7f0a6773c250d1c694e923a | |
| parent | f988ab6d41855de43c157633852f0fe3c0770c6d (diff) | |
| parent | bf8bd830fc71ccb85e8fa1d51c71199c01f9db67 (diff) | |
Merge pull request #137 from foonathan/master
CMake fixes
| -rwxr-xr-x | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ab6a72..92b5450 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,13 @@ cmake_minimum_required(VERSION 2.8.9) + +# prevent ugly developer warnings because version is set directly, not through project() +# it should be redone properly by using VERSION in project() if on CMake 3.x +if(CMAKE_MAJOR_VERSION GREATER 2) + cmake_policy(SET CMP0048 OLD) +endif() + project(cmark) + include("FindAsan.cmake") if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2de501a..ea55800 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -126,6 +126,7 @@ endif(MSVC) set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON) include (InstallRequiredSystemLibraries) install(TARGETS ${PROGRAM} ${LIBRARY} ${STATICLIBRARY} + EXPORT cmark RUNTIME DESTINATION bin LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR} @@ -138,6 +139,8 @@ install(FILES DESTINATION include ) +install(EXPORT cmark DESTINATION ${LIB_INSTALL_DIR}/cmake) + # Feature tests include(CheckIncludeFile) include(CheckCSourceCompiles) |