Skip to content

Commit

Permalink
Revert CMake changes
Browse files Browse the repository at this point in the history
  • Loading branch information
vitaut committed Nov 14, 2023
1 parent ec62856 commit 045b05d
Showing 1 changed file with 4 additions and 17 deletions.
21 changes: 4 additions & 17 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.8...3.28)
cmake_minimum_required(VERSION 3.8...3.26)

# Fallback for using newer policies on CMake <3.12.
if (${CMAKE_VERSION} VERSION_LESS 3.12)
Expand Down Expand Up @@ -26,7 +26,7 @@ endfunction()

# DEPRECATED! Should be merged into add_module_library.
function(enable_module target)
if (MSVC AND CMAKE_VERSION VERSION_LESS 3.28)
if (MSVC)
set(BMI ${CMAKE_CURRENT_BINARY_DIR}/${target}.ifc)
target_compile_options(${target}
PRIVATE /interface /ifcOutput ${BMI}
Expand Down Expand Up @@ -65,7 +65,7 @@ function(add_module_library name)
# `std` is affected by CMake options and may be higher than C++20.
get_target_property(std ${name} CXX_STANDARD)

if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_VERSION VERSION_LESS 3.28)
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(pcms)
foreach (src ${sources})
get_filename_component(pcm ${src} NAME_WE)
Expand Down Expand Up @@ -103,12 +103,7 @@ function(add_module_library name)
DEPENDS ${pcm})
endforeach ()
endif ()
if (CMAKE_VERSION VERSION_LESS 3.28)
target_sources(${name} PRIVATE ${sources})
else ()
target_sources(${name} PUBLIC FILE_SET fmt_module TYPE CXX_MODULES
FILES ${sources})
endif ()
target_sources(${name} PRIVATE ${sources})
endfunction()

include(CMakeParseArguments)
Expand Down Expand Up @@ -398,16 +393,8 @@ if (FMT_INSTALL)
LIBRARY DESTINATION ${FMT_LIB_DIR}
ARCHIVE DESTINATION ${FMT_LIB_DIR}
PUBLIC_HEADER DESTINATION "${FMT_INC_DIR}/fmt"
FILE_SET fmt_module DESTINATION "${FMT_LIB_DIR}/cxx/miu"
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

if (FMT_MODULE AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.28)
# Install format.cc and os.cc which are included by the fmt.cc module
# interface file.
install(FILES src/format.cc src/os.cc
DESTINATION "${FMT_LIB_DIR}/cxx/miu/src")
endif ()

# Use a namespace because CMake provides better diagnostics for namespaced
# imported targets.
export(TARGETS ${INSTALL_TARGETS} NAMESPACE fmt::
Expand Down

0 comments on commit 045b05d

Please sign in to comment.