version bump, clean up makefile

c9acff49 · Maarten L. Hekkelman · ac98531a · c9acff49 · ac98531a · ac98531a
Commit c9acff49 authored Mar 14, 2024 by Maarten L. Hekkelman
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 152 deletions

CMakeLists.txt
+2 -14

cmake/FindAtomic.cmake
+0 -63

cmake/FindFilesystem.cmake
+0 -75

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ cmake_minimum_required(VERSION 3.16)
 # set the project name
 project(
 	libcifpp
-	VERSION 7.0.3
+	VERSION 7.0.4
 	LANGUAGES CXX)
 list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
@@ -40,11 +40,6 @@ include(CheckCXXSourceCompiles)
 include(GenerateExportHeader)
 include(CTest)
 include(FetchContent)
-include(ExternalProject)
-set(CXX_EXTENSIONS OFF)
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
 # When building with ninja-multiconfig, build both debug and release by default
 if(CMAKE_GENERATOR STREQUAL "Ninja Multi-Config")
@@ -247,12 +242,6 @@ else()
 	set(EIGEN_INCLUDE_DIR ${my-eigen3_SOURCE_DIR})
 endif()
-include(FindFilesystem)
-list(APPEND CIFPP_REQUIRED_LIBRARIES ${STDCPPFS_LIBRARY})
-include(FindAtomic)
-list(APPEND CIFPP_REQUIRED_LIBRARIES ${STDCPPATOMIC_LIBRARY})
 # Create a revision file, containing the current git version info
 include(VersionString)
 write_version_header(${CMAKE_CURRENT_SOURCE_DIR}/src/ LIB_NAME "LibCIFPP")
@@ -369,8 +358,7 @@ target_include_directories(
 	"$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
 	PRIVATE "${BOOST_REGEX_INCLUDE_DIR}" "${EIGEN_INCLUDE_DIR}")
-target_link_libraries(cifpp PUBLIC Threads::Threads ZLIB::ZLIB
+target_link_libraries(cifpp PUBLIC Threads::Threads ZLIB::ZLIB)
-	${CIFPP_REQUIRED_LIBRARIES})
 if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
 	target_link_options(cifpp PRIVATE -undefined dynamic_lookup)

--- a/cmake/FindAtomic.cmake
+++ b/cmake/FindAtomic.cmake
-# Simple check to see if we need a library for std::atomic
-if(TARGET std::atomic)
-	return()
-endif()
-cmake_minimum_required(VERSION 3.10)
-include(CMakePushCheckState)
-include(CheckIncludeFileCXX)
-include(CheckCXXSourceRuns)
-cmake_push_check_state()
-check_include_file_cxx("atomic" _CXX_ATOMIC_HAVE_HEADER)
-mark_as_advanced(_CXX_ATOMIC_HAVE_HEADER)
-set(code [[
-#include <atomic>
-int main(int argc, char** argv) {
-  std::atomic<long long> s;
-  ++s;
-  return 0;
-}
-]])
-check_cxx_source_runs("${code}" _CXX_ATOMIC_BUILTIN)
-if(_CXX_ATOMIC_BUILTIN)
-	set(_found 1)
-else()
-  list(APPEND CMAKE_REQUIRED_LIBRARIES atomic)
-  list(APPEND FOLLY_LINK_LIBRARIES atomic)
-  check_cxx_source_runs("${code}" _CXX_ATOMIC_LIB_NEEDED)
-  if (NOT _CXX_ATOMIC_LIB_NEEDED)
-    message(FATAL_ERROR "unable to link C++ std::atomic code: you may need \
-      to install GNU libatomic")
-  else()
-	set(_found 1)
-  endif()
-endif()
-if(_found)
-	add_library(std::atomic INTERFACE IMPORTED)
-	set_property(TARGET std::atomic APPEND PROPERTY INTERFACE_COMPILE_FEATURES cxx_std_14)
-	if(_CXX_ATOMIC_BUILTIN)
-		# Nothing to add...
-	elseif(_CXX_ATOMIC_LIB_NEEDED)
-		set_target_properties(std::atomic PROPERTIES IMPORTED_LIBNAME atomic)
-		set(STDCPPATOMIC_LIBRARY atomic)
-	endif()
-endif()
-cmake_pop_check_state()
-set(Atomic_FOUND ${_found} CACHE BOOL "TRUE if we can run a program using std::atomic" FORCE)
-mark_as_advanced(Atomic_FOUND)
-if(Atomic_FIND_REQUIRED AND NOT Atomic_FOUND)
-    message(FATAL_ERROR "Cannot run simple program using std::atomic")
-endif()
--- a/cmake/FindFilesystem.cmake
+++ b/cmake/FindFilesystem.cmake
-# Simplistic reimplementation of https://github.com/vector-of-bool/CMakeCM/blob/master/modules/FindFilesystem.cmake
-if(TARGET std::filesystem)
-	return()
-endif()
-cmake_minimum_required(VERSION 3.10)
-include(CMakePushCheckState)
-include(CheckIncludeFileCXX)
-include(CheckCXXSourceCompiles)
-cmake_push_check_state()
-check_include_file_cxx("filesystem" _CXX_FILESYSTEM_HAVE_HEADER)
-mark_as_advanced(_CXX_FILESYSTEM_HAVE_HEADER)
-set(code [[
-#include <cstdlib>
-#include <filesystem>
-int main() {
-	auto cwd = std::filesystem::current_path();
-	return EXIT_SUCCESS;
-}
-]])
-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS_EQUAL 8.4.0)
-	# >> https://stackoverflow.com/questions/63902528/program-crashes-when-filesystempath-is-destroyed
-	set(CXX_FILESYSTEM_NO_LINK_NEEDED 0)
-else()
-	# Check a simple filesystem program without any linker flags
-	check_cxx_source_compiles("${code}" CXX_FILESYSTEM_NO_LINK_NEEDED)
-endif()
-if(CXX_FILESYSTEM_NO_LINK_NEEDED)
-	set(_found 1)
-else()
-	set(prev_libraries ${CMAKE_REQUIRED_LIBRARIES})
-	# Add the libstdc++ flag
-	set(CMAKE_REQUIRED_LIBRARIES ${prev_libraries} -lstdc++fs)
-	check_cxx_source_compiles("${code}" CXX_FILESYSTEM_STDCPPFS_NEEDED)
-	set(_found ${CXX_FILESYSTEM_STDCPPFS_NEEDED})
-	if(NOT CXX_FILESYSTEM_STDCPPFS_NEEDED)
-		# Try the libc++ flag
-		set(CMAKE_REQUIRED_LIBRARIES ${prev_libraries} -lc++fs)
-		check_cxx_source_compiles("${code}" CXX_FILESYSTEM_CPPFS_NEEDED)
-		set(_found ${CXX_FILESYSTEM_CPPFS_NEEDED})
-	endif()
-endif()
-if(_found)
-	add_library(std::filesystem INTERFACE IMPORTED)
-	set_property(TARGET std::filesystem APPEND PROPERTY INTERFACE_COMPILE_FEATURES cxx_std_17)
-	if(CXX_FILESYSTEM_NO_LINK_NEEDED)
-		# Nothing to add...
-	elseif(CXX_FILESYSTEM_STDCPPFS_NEEDED)
-		set_target_properties(std::filesystem PROPERTIES IMPORTED_LIBNAME stdc++fs)
-		set(STDCPPFS_LIBRARY stdc++fs)
-	elseif(CXX_FILESYSTEM_CPPFS_NEEDED)
-		set_target_properties(std::filesystem PROPERTIES IMPORTED_LIBNAME c++fs)
-		set(STDCPPFS_LIBRARY c++fs)
-	endif()
-endif()
-cmake_pop_check_state()
-set(Filesystem_FOUND ${_found} CACHE BOOL "TRUE if we can run a program using std::filesystem" FORCE)
-mark_as_advanced(Filesystem_FOUND)
-if(Filesystem_FIND_REQUIRED AND NOT Filesystem_FOUND)
-    message(FATAL_ERROR "Cannot run simple program using std::filesystem")
-endif()