diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2019-03-26 13:32:56 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-26 13:32:56 -0600 |
| commit | f90f2567a0ef0bfed119c19d9281c8c5d68d78c3 (patch) | |
| tree | 7c2a132113b0fd657cea1eed7fe96e7a5ba4f642 | |
| parent | faf7ab378518b6ad8792603a41c641cb13b2ff83 (diff) | |
| parent | abf3a7a47d45ddad2a1bd69b176a4c471f65231d (diff) | |
Merge pull request #269 from foonathan/master
Fix cmake warning about CMP0048, again
| -rwxr-xr-x | CMakeLists.txt | 18 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 10 |
2 files changed, 5 insertions, 23 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a25b269..4c438b6 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,12 +1,5 @@ -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) +cmake_minimum_required(VERSION 3.0) +project(cmark VERSION 0.28.3) include("FindAsan.cmake") @@ -14,13 +7,6 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") message(FATAL_ERROR "Do not build in-source.\nPlease remove CMakeCache.txt and the CMakeFiles/ directory.\nThen: mkdir build ; cd build ; cmake .. ; make") endif() -set(PROJECT_NAME "cmark") - -set(PROJECT_VERSION_MAJOR 0) -set(PROJECT_VERSION_MINOR 28) -set(PROJECT_VERSION_PATCH 3) -set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH} ) - option(CMARK_TESTS "Build cmark tests and enable testing" ON) option(CMARK_STATIC "Build static libcmark library" ON) option(CMARK_SHARED "Build shared libcmark library" ON) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 468b0f0..10fcb1d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -59,7 +59,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmark_version.h.in include (GenerateExportHeader) add_executable(${PROGRAM} ${PROGRAM_SOURCES}) -add_compiler_export_flags() # Disable the PUBLIC declarations when compiling the executable: set_target_properties(${PROGRAM} PROPERTIES @@ -72,12 +71,9 @@ set(CMAKE_LINKER_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG}") set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE} -pg") set(CMAKE_LINKER_PROFILE "${CMAKE_LINKER_FLAGS_RELEASE} -pg") -if (${CMAKE_VERSION} VERSION_GREATER "1.8") - set(CMAKE_C_VISIBILITY_PRESET hidden) - set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) -elseif(CMAKE_COMPILER_IS_GNUCC OR ${CMAKE_C_COMPILER_ID} STREQUAL "Clang") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden") -endif () +# -fvisibility=hidden +set(CMAKE_C_VISIBILITY_PRESET hidden) +set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) if (CMARK_SHARED) add_library(${LIBRARY} SHARED ${LIBRARY_SOURCES}) |