Skip to content

Commit 056747e

Browse files
author
Artur Bać
committed
update cmake code require version 3.21
1 parent d7ceeef commit 056747e

File tree

1 file changed

+10
-16
lines changed

1 file changed

+10
-16
lines changed

CMakeLists.txt

+10-16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.8 FATAL_ERROR )
1+
cmake_minimum_required(VERSION 3.21 FATAL_ERROR )
22

33
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
44

@@ -30,18 +30,13 @@ include(GNUInstallDirs)
3030
#-----------------------------------------------------------------------------
3131
# options
3232
#-----------------------------------------------------------------------------
33-
option(FIXEDMATH_ENABLE_UNIT_TESTS "unit tests available from CTest" OFF )
33+
if(PROJECT_IS_TOP_LEVEL)
34+
option(FIXEDMATH_ENABLE_UNIT_TESTS "unit tests available from CTest" OFF )
35+
add_feature_info("FIXEDMATH_ENABLE_UNIT_TESTS" FIXEDMATH_ENABLE_UNIT_TESTS "unit test available from CTest")
3436

35-
if(FIXEDMATH_ENABLE_UNIT_TESTS AND ${CMAKE_VERSION} VERSION_LESS "3.19.0")
36-
message( STATUS "unit tests not available as require cmake CheckSourceCompiles added in 3.19")
37-
set( FIXEDMATH_ENABLE_UNIT_TESTS OFF )
37+
option(FIXEDMATH_ENABLE_DEVEL_CODE "enable internaly used for development code" OFF )
38+
add_feature_info("ENABLE_DEVEL_CODE" ENABLE_DEVEL_CODE "enable internaly used for development code")
3839
endif()
39-
40-
add_feature_info("FIXEDMATH_ENABLE_UNIT_TESTS" FIXEDMATH_ENABLE_UNIT_TESTS "unit test available from CTest")
41-
42-
option(FIXEDMATH_ENABLE_DEVEL_CODE "enable internaly used for development code" OFF )
43-
add_feature_info("ENABLE_DEVEL_CODE" ENABLE_DEVEL_CODE "enable internaly used for development code")
44-
4540
# CMAKE_CXX_STANDARD used for compilation of fixedmath will not affect CMAKE_CXX_STANDARD avaialble when importing library
4641
if(NOT DEFINED CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS 17 )
4742
message(STATUS "Assuming by default c++17 standard")
@@ -61,13 +56,12 @@ if(FIXEDMATH_ENABLE_DEVEL_CODE)
6156
add_subdirectory(perf_test_suite)
6257
endif()
6358

64-
if( FIXEDMATH_ENABLE_UNIT_TESTS )
65-
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.19.0")
66-
enable_testing( TRUE )
67-
add_subdirectory(unit_tests)
59+
if( PROJECT_IS_TOP_LEVEL)
60+
if( FIXEDMATH_ENABLE_UNIT_TESTS )
61+
enable_testing( TRUE )
62+
add_subdirectory(unit_tests)
6863
endif()
6964
endif()
70-
7165
#-----------------------------------------------------------------------------
7266
# Add clean-all target
7367
#-----------------------------------------------------------------------------

0 commit comments

Comments
 (0)