Skip to content

Commit 7c4e4f8

Browse files
jbigotjbigot
committed
Updated Cmake dependency to 3.10
1 parent 478ef8b commit 7c4e4f8

File tree

9 files changed

+11
-70
lines changed

9 files changed

+11
-70
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
### Project header
3333

34-
cmake_minimum_required(VERSION 3.5)
34+
cmake_minimum_required(VERSION 3.10)
3535
project(PARACONF_DISTRIB LANGUAGES C CXX)
3636

3737

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ somewhere else than in `/usr/`.
3636
## Prerequisites
3737

3838
The paraconf distribution depends on:
39-
* cmake, version >= 3.5
39+
* cmake, version >= 3.10
4040
* a C-99 compiler (gcc-5.4 is tested)
4141
* a POSIX compatible OS (linux with GNU libc-2.27 is tested)
4242
* [libyaml](https://pyyaml.org/wiki/LibYAML) (included in Paraconf

‎cmake/SuperBuild.cmake‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# THE SOFTWARE.
2323
################################################################################
2424

25-
cmake_minimum_required(VERSION 3.5)
25+
cmake_minimum_required(VERSION 3.10)
2626

2727
cmake_policy(PUSH)
2828
if(POLICY CMP0114)
@@ -104,11 +104,7 @@ endfunction()
104104
#
105105
###
106106
function(sbuild_add_dependency _SBUILD_NAME _SBUILD_DEFAULT)
107-
if("${CMAKE_VERSION}" VERSION_LESS "3.7")
108-
cmake_parse_arguments(_SBUILD "BUILD_DEPENDENCY;NO_INSTALL" "EMBEDDED_PATH;BUILD_IN_SOURCE;VERSION;SOURCE_SUBDIR" "CMAKE_CACHE_ARGS;DEPENDS;CONFIGURE_COMMAND;BUILD_COMMAND;INSTALL_COMMAND;COMPONENTS;OPTIONAL_COMPONENTS;PATCH_COMMAND;MODULE_VARS" ${ARGN})
109-
else()
110-
cmake_parse_arguments(PARSE_ARGV 2 _SBUILD "BUILD_DEPENDENCY;NO_INSTALL" "EMBEDDED_PATH;BUILD_IN_SOURCE;VERSION;SOURCE_SUBDIR" "CMAKE_CACHE_ARGS;DEPENDS;CONFIGURE_COMMAND;BUILD_COMMAND;INSTALL_COMMAND;COMPONENTS;OPTIONAL_COMPONENTS;PATCH_COMMAND;MODULE_VARS")
111-
endif()
107+
cmake_parse_arguments(PARSE_ARGV 2 _SBUILD "BUILD_DEPENDENCY;NO_INSTALL" "EMBEDDED_PATH;BUILD_IN_SOURCE;VERSION;SOURCE_SUBDIR" "CMAKE_CACHE_ARGS;DEPENDS;CONFIGURE_COMMAND;BUILD_COMMAND;INSTALL_COMMAND;COMPONENTS;OPTIONAL_COMPONENTS;PATCH_COMMAND;MODULE_VARS")
112108

113109
if(DEFINED _SBUILD_EMBEDDED_PATH)
114110
set("USE_${_SBUILD_NAME}" "${_SBUILD_DEFAULT}" CACHE STRING "version of ${_SBUILD_NAME} to use, this can be 1) a path to the library source, 2) EMBEDDED to use the provided version, 3) SYSTEM to use an already installed version (you can use CMAKE_PREFIX_PATH to specify where to look, or 4) AUTO to use SYSTEM if available and EMBEDDED otherwise")
@@ -253,11 +249,7 @@ endfunction()
253249
#
254250
###
255251
function(sbuild_add_module _SBUILD_NAME)
256-
if("${CMAKE_VERSION}" VERSION_LESS "3.7")
257-
cmake_parse_arguments(_SBUILD "NO_INSTALL" "SOURCE_DIR;ENABLE_BUILD" "CMAKE_CACHE_ARGS;DEPENDS;SUBSTEPS;INSTALL_COMMAND" ${ARGN})
258-
else()
259-
cmake_parse_arguments(PARSE_ARGV 1 _SBUILD "NO_INSTALL" "SOURCE_DIR;ENABLE_BUILD" "CMAKE_CACHE_ARGS;DEPENDS;SUBSTEPS;INSTALL_COMMAND")
260-
endif()
252+
cmake_parse_arguments(PARSE_ARGV 1 _SBUILD "NO_INSTALL" "SOURCE_DIR;ENABLE_BUILD" "CMAKE_CACHE_ARGS;DEPENDS;SUBSTEPS;INSTALL_COMMAND")
261253

262254
if(DEFINED _SBUILD_ENABLE_BUILD AND NOT "${_SBUILD_ENABLE_BUILD}")
263255
message(STATUS " **Module**: DISABLED ${_SBUILD_NAME}")
@@ -341,11 +333,7 @@ endfunction()
341333

342334
if("${BUILD_TESTING}")
343335
enable_testing()
344-
if("${CMAKE_VERSION}" VERSION_LESS 3.10)
345-
set_property(DIRECTORY "${CMAKE_SOURCE_DIR}" PROPERTY TEST_INCLUDE_FILE "${CMAKE_BINARY_DIR}/SubTests.cmake")
346-
else()
347-
set_property(DIRECTORY "${CMAKE_SOURCE_DIR}" APPEND PROPERTY TEST_INCLUDE_FILES "${CMAKE_BINARY_DIR}/SubTests.cmake")
348-
endif()
336+
set_property(DIRECTORY "${CMAKE_SOURCE_DIR}" PROPERTY TEST_INCLUDE_FILE "${CMAKE_BINARY_DIR}/SubTests.cmake")
349337
file(WRITE "${CMAKE_BINARY_DIR}/SubTests.cmake"
350338
"set(ADDPATH [=[${CMAKE_BINARY_DIR}/staging/${CMAKE_INSTALL_LIBDIR}:${CMAKE_BINARY_DIR}/staging/lib]=])\n"
351339
[===[

‎example/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
# POSSIBILITY OF SUCH DAMAGE.
2828
#=============================================================================
2929

30-
cmake_minimum_required(VERSION 3.5)
30+
cmake_minimum_required(VERSION 3.10)
3131
project(paraconf_examples LANGUAGES C CXX)
3232

3333
if("${BUILD_FORTRAN}")

‎paraconf/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
# POSSIBILITY OF SUCH DAMAGE.
2828
#=============================================================================
2929

30-
cmake_minimum_required(VERSION 3.5)
30+
cmake_minimum_required(VERSION 3.10)
3131
project(paraconf LANGUAGES C)
3232
list(APPEND CMAKE_MODULE_PATH "${PDI_SOURCE_DIR}/cmake")
3333

‎paraconf/cmake/Findyaml.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2525
#--------------------------------------------------------------------------------
2626

27-
cmake_minimum_required(VERSION 3.5)
27+
cmake_minimum_required(VERSION 3.10)
2828

2929
# - Check for the presence of libyaml
3030
#

‎paraconf/cmake/GenerateExportHeader.cmake‎

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -169,21 +169,6 @@ For example:
169169
generate_export_header(somelib PREFIX_NAME VTK_)
170170
171171
Generates the macros ``VTK_SOMELIB_EXPORT`` etc.
172-
173-
::
174-
175-
ADD_COMPILER_EXPORT_FLAGS( [<output_variable>] )
176-
177-
The ``ADD_COMPILER_EXPORT_FLAGS`` function adds ``-fvisibility=hidden`` to
178-
:variable:`CMAKE_CXX_FLAGS <CMAKE_<LANG>_FLAGS>` if supported, and is a no-op
179-
on Windows which does not need extra compiler flags for exporting support.
180-
You may optionally pass a single argument to ``ADD_COMPILER_EXPORT_FLAGS``
181-
that will be populated with the ``CXX_FLAGS`` required to enable visibility
182-
support for the compiler/architecture in use.
183-
184-
This function is deprecated. Set the target properties
185-
:prop_tgt:`CXX_VISIBILITY_PRESET <<LANG>_VISIBILITY_PRESET>` and
186-
:prop_tgt:`VISIBILITY_INLINES_HIDDEN` instead.
187172
#]=======================================================================]
188173

189174
include(CheckCCompilerFlag)
@@ -409,35 +394,3 @@ function(GENERATE_EXPORT_HEADER TARGET_LIBRARY)
409394
_do_set_macro_values(${TARGET_LIBRARY})
410395
_do_generate_export_header(${TARGET_LIBRARY} ${ARGN})
411396
endfunction()
412-
413-
function(add_compiler_export_flags)
414-
if(NOT CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12)
415-
message(DEPRECATION "The add_compiler_export_flags function is obsolete. Use the CXX_VISIBILITY_PRESET and VISIBILITY_INLINES_HIDDEN target properties instead.")
416-
endif()
417-
418-
_test_compiler_hidden_visibility()
419-
_test_compiler_has_deprecated()
420-
421-
option(USE_COMPILER_HIDDEN_VISIBILITY
422-
"Use HIDDEN visibility support if available." ON)
423-
mark_as_advanced(USE_COMPILER_HIDDEN_VISIBILITY)
424-
if(NOT (USE_COMPILER_HIDDEN_VISIBILITY AND COMPILER_HAS_HIDDEN_VISIBILITY))
425-
# Just return if there are no flags to add.
426-
return()
427-
endif()
428-
429-
set (EXTRA_FLAGS "-fvisibility=hidden")
430-
431-
if(COMPILER_HAS_HIDDEN_INLINE_VISIBILITY)
432-
set (EXTRA_FLAGS "${EXTRA_FLAGS} -fvisibility-inlines-hidden")
433-
endif()
434-
435-
# Either return the extra flags needed in the supplied argument, or to the
436-
# CMAKE_CXX_FLAGS if no argument is supplied.
437-
if(ARGC GREATER 0)
438-
set(${ARGV0} "${EXTRA_FLAGS}" PARENT_SCOPE)
439-
else()
440-
string(APPEND CMAKE_CXX_FLAGS " ${EXTRA_FLAGS}")
441-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" PARENT_SCOPE)
442-
endif()
443-
endfunction()

‎paraconf/cmake/paraconfConfig.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# THE SOFTWARE.
2323
################################################################################
2424

25-
cmake_minimum_required(VERSION 3.5)
25+
cmake_minimum_required(VERSION 3.10)
2626
list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_LIST_DIR}")
2727

2828
include(CMakeFindDependencyMacro)

‎paraconf/tests/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
# POSSIBILITY OF SUCH DAMAGE.
2828
#=============================================================================
2929

30-
cmake_minimum_required(VERSION 3.5)
30+
cmake_minimum_required(VERSION 3.10)
3131

3232
add_executable(test1 test1.c)
3333
target_link_libraries(test1 paraconf::paraconf)

0 commit comments

Comments
 (0)