Skip to content

Commit 7447b47

Browse files
committed
CAPITAL -> capital
1 parent 51b6412 commit 7447b47

File tree

1 file changed

+31
-39
lines changed

1 file changed

+31
-39
lines changed

CMakeLists.txt

Lines changed: 31 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
2-
set(CMAKE_BUILD_TYPE Debug)
3-
4-
5-
6-
#option(USE_CLANG "build application with clang" ON) # OFF is the default
7-
option(USE_CLANG "build application with clang" OFF)
8-
92

3+
set(CMAKE_BUILD_TYPE Debug)
4+
option(USE_CLANG "build application with clang" OFF)# OFF is the default
105

116
if(USE_CLANG)
127
set (CMAKE_C_COMPILER "/usr/bin/clang")
@@ -30,9 +25,6 @@ if(USE_CLANG)
3025
set (CMAKE_RANLIB "/usr/bin/llvm-ranlib")
3126
endif()
3227

33-
34-
35-
3628
project(cpp_tutorials)
3729
set(CMAKE_VERBOSE_MAKEFILE "erbose output from Makefile " OFF)
3830

@@ -453,7 +445,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND ${CMAKE_CXX_COMPILER_VERSION} GRE
453445
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND ${CMAKE_CXX_COMPILER_VERSION} GREATER_EQUAL 13)
454446
add_executable(printing_with_format src/printing_with_format.cpp)
455447
target_link_libraries(printing_with_format)
456-
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND ${CMAKE_CXX_COMPILER_VERSION} GREATER_EQUAL 19)
448+
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND ${CMAKE_CXX_COMPILER_VERSION} GREATER_EQUAL 1900)
457449
add_executable(printing_with_format src/printing_with_format.cpp)
458450
target_link_libraries(printing_with_format)
459451
endif()
@@ -464,19 +456,19 @@ find_package(PkgConfig)
464456
if(EXISTS "$ENV{HOME}/usr/lib/pkgconfig")
465457
set(ENV{PKG_CONFIG_PATH} "$ENV{HOME}/usr/lib/pkgconfig:" $ENV{PKG_CONFIG_PATH})
466458
endif()
467-
MESSAGE("PKG_CONFIG_PATH:" $ENV{PKG_CONFIG_PATH})
459+
message("PKG_CONFIG_PATH:" $ENV{PKG_CONFIG_PATH})
468460

469461

470462
message("\n########################################## tinyxml2 ##########################################\n")
471463
pkg_check_modules(TINYXML2 tinyxml2)
472464
if(${TINYXML2_FOUND})
473-
MESSAGE("TINYXML2_FOUND:" ${TINYXML2_FOUND})
474-
MESSAGE("TINYXML2_VERSION:" ${TINYXML2_VERSION})
475-
MESSAGE("TINYXML2_LIBRARIES:" ${TINYXML2_LIBRARIES})
476-
MESSAGE("TINYXML2_INCLUDE_DIRS:" ${TINYXML2_INCLUDE_DIRS})
477-
MESSAGE("TINYXML2_LIBRARY_DIRS:" ${TINYXML2_LIBRARY_DIRS})
478-
INCLUDE_DIRECTORIES(${TINYXML2_INCLUDE_DIRS})
479-
LINK_DIRECTORIES(${TINYXML2_LIBRARY_DIRS})
465+
message("TINYXML2_FOUND:" ${TINYXML2_FOUND})
466+
message("TINYXML2_VERSION:" ${TINYXML2_VERSION})
467+
message("TINYXML2_LIBRARIES:" ${TINYXML2_LIBRARIES})
468+
message("TINYXML2_INCLUDE_DIRS:" ${TINYXML2_INCLUDE_DIRS})
469+
message("TINYXML2_LIBRARY_DIRS:" ${TINYXML2_LIBRARY_DIRS})
470+
include_directories(${TINYXML2_INCLUDE_DIRS})
471+
link_directories(${TINYXML2_LIBRARY_DIRS})
480472
add_executable(tinyxml2_demo src/third_party_tools/xml/tinyxml2/tinyxml2_demo.cpp)
481473
target_link_libraries(tinyxml2_demo ${TINYXML2_LIBRARIES})
482474
else()
@@ -487,38 +479,38 @@ endif()
487479
message("\n########################################## yaml-cpp ##########################################\n")
488480

489481
set(yaml-cpp_DIR "$ENV{HOME}/usr/share/cmake/yaml-cpp")
490-
FIND_PACKAGE(yaml-cpp)
491-
IF(${yaml-cpp_FOUND})
492-
MESSAGE("yaml-cpp_FOUND:" ${yaml-cpp_FOUND})
493-
MESSAGE("yaml-cpp_VERSION:" ${yaml-cpp_VERSION})
482+
find_package(yaml-cpp)
483+
if(${yaml-cpp_FOUND})
484+
message("yaml-cpp_FOUND:" ${yaml-cpp_FOUND})
485+
message("yaml-cpp_VERSION:" ${yaml-cpp_VERSION})
494486
add_executable(yaml-cpp_example src/third_party_tools/yaml/yaml-cpp/yaml-cpp_example.cpp )
495487
target_link_libraries(yaml-cpp_example yaml-cpp)
496-
ENDIF()
488+
endif()
497489

498490
pkg_check_modules(BENCHMARK benchmark)
499491
if(${BENCHMARK_FOUND})
500-
MESSAGE("BENCHMARK_FOUND:" ${BENCHMARK_FOUND})
501-
MESSAGE("BENCHMARK_VERSION:" ${BENCHMARK_VERSION})
502-
MESSAGE("BENCHMARK_LIBRARIES:" ${BENCHMARK_LIBRARIES})
503-
MESSAGE("BENCHMARK_INCLUDE_DIRS:" ${BENCHMARK_INCLUDE_DIRS})
504-
MESSAGE("BENCHMARK_LIBRARY_DIRS:" ${BENCHMARK_LIBRARY_DIRS})
505-
INCLUDE_DIRECTORIES(${TINYXML2_INCLUDE_DIRS})
506-
LINK_DIRECTORIES(${TINYXML2_LIBRARY_DIRS})
492+
message("BENCHMARK_FOUND:" ${BENCHMARK_FOUND})
493+
message("BENCHMARK_VERSION:" ${BENCHMARK_VERSION})
494+
message("BENCHMARK_LIBRARIES:" ${BENCHMARK_LIBRARIES})
495+
message("BENCHMARK_INCLUDE_DIRS:" ${BENCHMARK_INCLUDE_DIRS})
496+
message("BENCHMARK_LIBRARY_DIRS:" ${BENCHMARK_LIBRARY_DIRS})
497+
include_directories(${TINYXML2_INCLUDE_DIRS})
498+
link_directories(${TINYXML2_LIBRARY_DIRS})
507499
add_executable(benchmark_demo src/third_party_tools/benchmark/benchmark_demo.cpp)
508500
target_link_libraries(benchmark_demo ${BENCHMARK_LIBRARIES} pthread)
509501
endif()
510502

511503

512-
OPTION(TESTING "Enable testing" OFF)
513-
IF(testing_enabled)
514-
ADD_SUBDIRECTORY(tests)
515-
ENDIF()
504+
option(TESTING "Enable testing" OFF)
505+
if(testing_enabled)
506+
add_subdirectory(tests)
507+
endif()
516508

517509

518-
MESSAGE(${CMAKE_CURRENT_SOURCE_DIR})
519-
IF(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src/sandbox")
520-
ADD_SUBDIRECTORY("${CMAKE_CURRENT_SOURCE_DIR}/src/sandbox")
521-
ENDIF()
510+
message(${CMAKE_CURRENT_SOURCE_DIR})
511+
if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src/sandbox")
512+
add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/sandbox")
513+
endif()
522514

523515

524516

0 commit comments

Comments
 (0)