diff --git a/CMakeLists.txt b/CMakeLists.txt index cc17f2c8..41d43c1e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,8 @@ # SOFTWARE. cmake_minimum_required(VERSION 3.12) -project(mp-units) +project(mp-units + LANGUAGES CXX) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") @@ -41,12 +42,12 @@ add_subdirectory(src) # set restrictive compilation warnings set_warnings(mp-units) -# add unit tests -enable_testing() -add_subdirectory(test) - # add usage example add_subdirectory(example) # generate project documentation add_subdirectory(docs) + +# add unit tests +enable_testing() +add_subdirectory(test) diff --git a/cmake/common/scripts.cmake b/cmake/common/scripts.cmake index b3ea4224..cf732be5 100644 --- a/cmake/common/scripts.cmake +++ b/cmake/common/scripts.cmake @@ -22,7 +22,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") -include(conan) include(install) include(static_analysis) include(warnings) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9c591814..a8a457f3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -41,20 +41,6 @@ find_package(Microsoft.GSL CONFIG REQUIRED) # library definition add_library(mp-units INTERFACE) -#target_sources(mp-units INTERFACE -# include/units/dimension.h -# include/units/quantity.h -# include/units/unit.h -# -# include/units/bits/tools.h -# include/units/bits/type_list.h -# -# include/units/si/base_dimensions.h -# include/units/si/frequency.h -# include/units/si/length.h -# include/units/si/time.h -# include/units/si/speed.h -#) target_compile_features(mp-units INTERFACE cxx_std_20) target_link_libraries(mp-units INTERFACE