Skip to content

Commit 5f527a5

Browse files
committed
bumped version of cmake and c++, fixed typo
1 parent 9308700 commit 5f527a5

3 files changed

Lines changed: 6 additions & 13 deletions

File tree

CMakeLists.txt

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.12.0)
1+
cmake_minimum_required(VERSION 3.16.0)
22
project(my_project VERSION 0.1.0)
33

44
find_program(CCACHE_PROGRAM ccache)
@@ -45,15 +45,8 @@ set(USER_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
4545
list(APPEND CMAKE_MODULE_PATH "${USER_CMAKE_PATH}/modules")
4646
list(APPEND CMAKE_PREFIX_PATH "/usr/lib/${CMAKE_SYSTEM_PROCESSOR}-linux-gnu/cmake")
4747

48-
# # Add external dependencies
49-
set(CONAN_CMAKE_SETUP ${CMAKE_BINARY_DIR}/conan_paths.cmake)
50-
51-
if (EXISTS ${CONAN_CMAKE_SETUP} AND NOT IS_DIRECTORY ${CONAN_CMAKE_SETUP})
52-
include(${CONAN_CMAKE_SETUP})
53-
endif ()
54-
55-
# # Set compiler to use c++ 14 features
56-
set(CMAKE_CXX_STANDARD 14)
48+
# # Set compiler to use c++ 17 features
49+
set(CMAKE_CXX_STANDARD 17)
5750
set(CMAKE_CXX_EXTENSIONS OFF)
5851
set(CMAKE_CXX_STANDARD_REQUIRED ON)
5952

cmake/my_projectConfig.cmake.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ include(CMakeFindDependencyMacro)
66
# Same syntax as find_package
77
find_dependency(Threads REQUIRED)
88

9-
// find_package(PkgConfig REQUIRED)
10-
// pkg_check_modules(LelyIO QUIET IMPORTED_TARGET liblely-io2)
9+
#find_package(PkgConfig REQUIRED)
10+
#pkg_check_modules(LelyIO QUIET IMPORTED_TARGET liblely-io2)
1111

1212
# Any extra setup
1313

cmake/version.hpp.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
#define PROJECT_VERSION_STRING "@PROJECT_VERSION@"
1515
#define PROJECT_VERSION_MAJOR "@PROJECT_VERSION_MAJOR@"
1616
#define PROJECT_VERSION_MINOR "@PROJECT_VERSION_MINOR@"
17-
#define PTOJECT_VERSION_PATCH "@PROJECT_VERSION_PATCH@"
17+
#define PROJECT_VERSION_PATCH "@PROJECT_VERSION_PATCH@"
1818

1919
#endif /* MY_PROJECT_VERSION_HPP */

0 commit comments

Comments
 (0)