Code Review
/
ric-plt
/
tracelibcpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix Cmake file and no-op tracer creation
[ric-plt/tracelibcpp.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
a3b0e0d
..
6a8d101
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-30,10
+30,19
@@
HunterGate(
project(tracelibcpp LANGUAGES CXX C)
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/cxx1.cmake)
project(tracelibcpp LANGUAGES CXX C)
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/cxx1.cmake)
+add_compile_options(-Wall -Wextra -Werror)
+set(CMAKE_CXX_STANDARD 11)
+
+if(NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE Release)
+endif()
+
+set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
+set(CMAKE_CXX_FLAGS_RELEASE "-O2")
set (tracelibcpp_VERSION_MAJOR "0")
set (tracelibcpp_VERSION_MINOR "0")
set (tracelibcpp_VERSION_MAJOR "0")
set (tracelibcpp_VERSION_MINOR "0")
-set (tracelibcpp_VERSION_MICRO "
2
")
+set (tracelibcpp_VERSION_MICRO "
3
")
set (tracelibcpp_VERSION_STRING
"${tracelibcpp_VERSION_MAJOR}.${tracelibcpp_VERSION_MINOR}.${tracelibcpp_VERSION_MICRO}")
set (tracelibcpp_VERSION_STRING
"${tracelibcpp_VERSION_MAJOR}.${tracelibcpp_VERSION_MINOR}.${tracelibcpp_VERSION_MICRO}")
@@
-79,6
+88,8
@@
add_library(tracelibcpp SHARED
src/tracelib.cpp
)
src/tracelib.cpp
)
+# Library versions are on by default
+# i.e. so versions
option(WITH_VERSION "Support for library versioning" ON)
if (WITH_VERSION)
option(WITH_VERSION "Support for library versioning" ON)
if (WITH_VERSION)
@@
-86,10
+97,6
@@
if (WITH_VERSION)
SOVERSION ${tracelibcpp_VERSION_MAJOR})
endif (WITH_VERSION)
SOVERSION ${tracelibcpp_VERSION_MAJOR})
endif (WITH_VERSION)
-# Library versions are on by default
-# i.e. so versions
-option(WITH_VERSION "Support for library versioning" ON)
-
if (WITH_VERSION)
set_target_properties(tracelibcpp PROPERTIES VERSION ${tracelibcpp_VERSION_STRING}
SOVERSION ${tracelibcpp_VERSION_MAJOR})
if (WITH_VERSION)
set_target_properties(tracelibcpp PROPERTIES VERSION ${tracelibcpp_VERSION_STRING}
SOVERSION ${tracelibcpp_VERSION_MAJOR})
@@
-120,6
+127,12
@@
install(TARGETS tracelibcpp
# Add google test
if (WITH_TESTING)
# Add google test
if (WITH_TESTING)
+ file(
+ DOWNLOAD https://raw.githubusercontent.com/bilke/cmake-modules/72d804cfbcf82a1e171200c9c02748fa4b7ea033/CodeCoverage.cmake
+ ${CMAKE_BINARY_DIR}/CodeCoverage.cmake)
+
+ include("${CMAKE_BINARY_DIR}/CodeCoverage.cmake")
+ APPEND_COVERAGE_COMPILER_FLAGS()
hunter_add_package(GTest)
find_package(GTest CONFIG REQUIRED)
add_executable(testrunner
hunter_add_package(GTest)
find_package(GTest CONFIG REQUIRED)
add_executable(testrunner