Skip to content

Commit

Permalink
more cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
jll63 committed Sep 25, 2024
1 parent 3872d94 commit 6d03228
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
11 changes: 2 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,10 @@ if(NOT CMAKE_CXX_STANDARD)
endif()
set(CMAKE_CXX_STANDARD_REQUIRED ON)

option(YOMM2_SHARED "Build yomm2 as a shared library" OFF)
option(YOMM2_ENABLE_EXAMPLES "Set to ON to build examples" OFF)
option(YOMM2_DEBUG_MACROS "Set to ON to debug macros" OFF)
option(YOMM2_ENABLE_TESTS "Set to ON to build tests" OFF)
option(YOMM2_ENABLE_BENCHMARKS "Set to ON to enable benchmarks" OFF)
option(
YOMM2_CHECK_ABI_COMPATIBILITY
"Build shared library and examples in different modes" OFF)

include(CMakeDependentOption)
CMAKE_DEPENDENT_OPTION(YOMM2_ENABLE_BENCHMARKS
Expand All @@ -40,11 +36,7 @@ if(NOT MSVC AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(COMPILER_IS_CLANG ON)
endif()

if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
set(VARIANT_IS_DEBUG ON)
endif()

if (VARIANT_IS_DEBUG)
if (CMAKE_BUILD_TYPE MATCHES DEBUG)
if(COMPILER_IS_CLANG)
add_compile_options(-fno-limit-debug-info)
endif()
Expand All @@ -53,6 +45,7 @@ if (VARIANT_IS_DEBUG)
endif()
else()
if(CMAKE_COMPILER_IS_GNUCXX OR COMPILER_IS_CLANG)
message(STATUS "${CMAKE_BUILD_TYPE}")
add_compile_options(-save-temps -masm=intel)
endif()
endif()
Expand Down
4 changes: 2 additions & 2 deletions include/yorel/yomm2/detail/types.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ struct class_info : static_list<class_info>::static_link {
type_id *first_base, *last_base;
bool is_abstract{false};

auto vptr() const -> const std::uintptr_t* {
auto vptr() const {
return *static_vptr;
}

auto indirect_vptr() const -> const std::uintptr_t* const* {
auto indirect_vptr() {
return static_vptr;
}

Expand Down

0 comments on commit 6d03228

Please sign in to comment.