Restructuring #2
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| Checks: > | ||
| -*, | ||
| bugprone-*, | ||
| clang-diagnostic-*, | ||
| clang-analyzer-*, | ||
| cppcoreguidelines-*, | ||
| llvm-*, | ||
| misc-*, | ||
| modernize-*, | ||
| performance-*, | ||
| portability-*, | ||
| readability-*, | ||
| -bugprone-narrowing-conversions, | ||
| -bugprone-easily-swappable-parameters, | ||
| -bugprone-implicit-widening-of-multiplication-result, | ||
| -bugprone-unchecked-optional-access, | ||
| -misc-const-correctness, | ||
| -misc-unused-parameters, | ||
| -misc-non-private-member-variables-in-classes, | ||
| -misc-no-recursion, | ||
| -misc-use-anonymous-namespace, | ||
| -modernize-return-braced-init-list, | ||
| -modernize-use-trailing-return-type, | ||
| -readability-braces-around-statements, | ||
| -readability-identifier-length, | ||
| -readability-magic-numbers, | ||
| -readability-named-parameter, | ||
| -readability-function-cognitive-complexity, | ||
| -readability-implicit-bool-conversion, | ||
| -cppcoreguidelines-avoid-magic-numbers, | ||
| -clang-analyzer-cplusplus.NewDeleteLeaks, | ||
|
|
||
| CheckOptions: | ||
| - key: readability-identifier-naming.ClassCase | ||
| value: aNy_CasE | ||
| - key: readability-identifier-naming.FunctionCase | ||
| value: aNy_CasE | ||
| - key: readability-identifier-naming.MemberCase | ||
| value: aNy_CasE | ||
| - key: readability-identifier-naming.PrivateMemberPrefix | ||
| value: 'm_' | ||
| - key: readability-identifier-naming.ProtectedMemberPrefix | ||
| value: 'm_' | ||
| - key: readability-identifier-naming.PublicMemberPrefix | ||
| value: '' | ||
| - key: readability-identifier-naming.ParameterCase | ||
| value: aNy_CasE | ||
| - key: readability-identifier-naming.UnionCase | ||
| value: CamelCase | ||
| - key: readability-identifier-naming.VariableCase | ||
| value: aNy_CasE | ||
| - key: readability-identifier-naming.IgnoreMainLikeFunctions | ||
| value: 1 | ||
| - key: readability-implicit-bool-conversion.AllowPointerConditions | ||
| value: 1 | ||
| - key: readability-magic-numbers.IgnorePowersOf2IntegerValues | ||
| value: 1 | ||
| - key: readability-magic-numbers.IgnoredIntegerValues | ||
| value: 4;8;16; | ||
| - key: bugprone-argument-comment.CommentNullPtrs | ||
| value: 1 | ||
| - key: bugprone-argument-comment.CommentBoolLiterals | ||
| value: 1 | ||
| - key: bugprone-argument-comment.StrictMode | ||
| value: 1 | ||
| - key: bugprone-argument-comment.CommentIntegerLiterals | ||
| value: 1 | ||
| - key: bugprone-argument-comment.CommentUserDefinedLiterals | ||
| value: 1 | ||
| - key: bugprone-argument-comment.CommentStringLiterals | ||
| value: 1 | ||
| - key: bugprone-argument-comment.CommentFloatLiterals | ||
| value: 1 | ||
| - key: bugprone-argument-comment.CommentCharacterLiterals | ||
| value: 1 | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,3 +17,9 @@ tmp/ | |
| *.bk | ||
| *.rootix | ||
| *.sam | ||
| build/ | ||
| cmake-build-*/ | ||
| Build/ | ||
| BUILD/ | ||
| Testing/ | ||
| .vscode/ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,44 +1,59 @@ | ||
| cmake_minimum_required(VERSION 3.16) | ||
| project(ramtools VERSION 1.0.0 LANGUAGES CXX) | ||
|
|
||
| set(CMAKE_EXPORT_COMPILE_COMMANDS ON) | ||
|
|
||
| set(CMAKE_CXX_STANDARD 17) | ||
| set(CMAKE_CXX_STANDARD_REQUIRED ON) | ||
| set(CMAKE_POSITION_INDEPENDENT_CODE ON) | ||
|
|
||
| option(RAMTOOLS_BUILD_TESTS "Build unit tests" ON) | ||
| option(RAMTOOLS_BUILD_BENCHMARKS "Build benchmarks" ON) | ||
| option(RAMTOOLS_BUILD_TOOLS "Build tools" ON) | ||
|
|
||
| find_package(ROOT 6.26 REQUIRED COMPONENTS Core RIO Tree ROOTNTuple ROOTNTupleUtil) | ||
AdityaPandeyCN marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| include(${ROOT_USE_FILE}) | ||
|
|
||
| include(GNUInstallDirs) | ||
| set(CMAKE_INSTALL_LIBDIR lib) | ||
| set(CMAKE_INSTALL_INCLUDEDIR include) | ||
|
|
||
| set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/inc) | ||
|
There was a problem hiding this comment. That's the same as There was a problem hiding this comment. I am still confused about this, not able to implement removing There was a problem hiding this comment. I will need more information about that. Compiling which library fails if you remove that line? There was a problem hiding this comment. Made some changes, what do you think about it now? |
||
|
|
||
| ROOT_STANDARD_LIBRARY_PACKAGE(ramtools | ||
| HEADERS | ||
| ttree/RAMRecord.h | ||
| ttree/Utils.h | ||
| ttree/CigarOps.h | ||
| rntuple/RAMNTupleRecord.h | ||
| SOURCES | ||
| src/ttree/RAMRecord.cxx | ||
| src/rntuple/RAMNTupleRecord.cxx | ||
| LINKDEF | ||
| inc/ttree/LinkDef.h | ||
| DEPENDENCIES | ||
| ROOT::Core | ||
| ROOT::RIO | ||
| ROOT::Tree | ||
| ROOT::ROOTNTuple | ||
| ROOT::ROOTNTupleUtil | ||
| INSTALL_OPTIONS | ||
| DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
| ) | ||
|
|
||
| install(DIRECTORY inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) | ||
|
|
||
| if(RAMTOOLS_BUILD_TOOLS) | ||
| add_subdirectory(tools) | ||
| endif() | ||
|
|
||
| if(RAMTOOLS_BUILD_TESTS) | ||
| enable_testing() | ||
| add_subdirectory(test) | ||
| endif() | ||
|
|
||
vgvassilev marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if(RAMTOOLS_BUILD_BENCHMARKS) | ||
| add_subdirectory(benchmark) | ||
| endif() | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| # Benchmark targets can be added here in future | ||
|
|
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| set(_gtest_byproduct_binary_dir | ||
| ${CMAKE_BINARY_DIR}/test/googletest-prefix/src/googletest-build) | ||
| set(_gtest_byproducts | ||
| ${_gtest_byproduct_binary_dir}/lib/libgtest.a | ||
| ${_gtest_byproduct_binary_dir}/lib/libgtest_main.a | ||
| ${_gtest_byproduct_binary_dir}/lib/libgmock.a | ||
| ${_gtest_byproduct_binary_dir}/lib/libgmock_main.a | ||
| ) | ||
|
|
||
| if(MSVC) | ||
| set(EXTRA_GTEST_OPTS | ||
| -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG:PATH=${_gtest_byproduct_binary_dir}/lib/ | ||
| -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL:PATH=${_gtest_byproduct_binary_dir}/lib/ | ||
| -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=${_gtest_byproduct_binary_dir}/lib/ | ||
| -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO:PATH=${_gtest_byproduct_binary_dir}/lib/ | ||
| -Dgtest_force_shared_crt=ON) | ||
| elseif(APPLE) | ||
| set(EXTRA_GTEST_OPTS -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT} | ||
| -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}) | ||
| endif() | ||
|
|
||
| include(ExternalProject) | ||
| ExternalProject_Add( | ||
| googletest | ||
| GIT_REPOSITORY https://github.com/google/googletest.git | ||
| EXCLUDE_FROM_ALL 1 | ||
| GIT_SHALLOW 1 | ||
| GIT_TAG v1.14.0 | ||
| UPDATE_COMMAND "" | ||
| CMAKE_ARGS -G ${CMAKE_GENERATOR} | ||
| -DCMAKE_BUILD_TYPE=Release | ||
| -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} | ||
| -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} | ||
| -DCMAKE_AR=${CMAKE_AR} | ||
| -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} | ||
| ${EXTRA_GTEST_OPTS} | ||
| BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config Release | ||
| INSTALL_COMMAND "" | ||
| BUILD_BYPRODUCTS ${_gtest_byproducts} | ||
| LOG_DOWNLOAD ON | ||
| LOG_CONFIGURE ON | ||
| LOG_BUILD ON | ||
| TIMEOUT 600 | ||
| ) | ||
|
|
||
| ExternalProject_Get_Property(googletest source_dir) | ||
| set(GTEST_INCLUDE_DIR ${source_dir}/googletest/include) | ||
| set(GMOCK_INCLUDE_DIR ${source_dir}/googlemock/include) | ||
| file(MAKE_DIRECTORY ${GTEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR}) | ||
|
|
||
| ExternalProject_Get_Property(googletest binary_dir) | ||
| set(_G_LIBRARY_PATH ${binary_dir}/lib/) | ||
|
|
||
| foreach(lib gtest gtest_main gmock gmock_main) | ||
| add_library(${lib} IMPORTED STATIC GLOBAL) | ||
| set_target_properties(${lib} PROPERTIES | ||
| IMPORTED_LOCATION "${_G_LIBRARY_PATH}${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX}" | ||
| INTERFACE_INCLUDE_DIRECTORIES "${GTEST_INCLUDE_DIR}" | ||
| ) | ||
| add_dependencies(${lib} googletest) | ||
| endforeach() | ||
|
|
||
| target_include_directories(gtest INTERFACE ${GTEST_INCLUDE_DIR}) | ||
| target_include_directories(gmock INTERFACE ${GMOCK_INCLUDE_DIR}) | ||
|
|
||
| add_library(GTest::gtest ALIAS gtest) | ||
| add_library(GTest::gtest_main ALIAS gtest_main) | ||
| add_library(GTest::gmock ALIAS gmock) | ||
| add_library(GTest::gmock_main ALIAS gmock_main) | ||
|
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.