cpu_count: work with Visual Studio, single target

geospace-code · Jul 29, 2022 · 423f87c · 423f87c
1 parent bfd0d1c
commit 423f87c
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,9 +19,18 @@ DESCRIPTION "Lightweight object-oriented HDF5 MPI parallel Fortran interface"
 HOMEPAGE_URL https://github.com/geospace-code/h5fortran-mpi
 )
 
-include(CTest)
+enable_testing()
+
 if(NOT DEFINED ${PROJECT_NAME}_BUILD_TESTING)
-  set(${PROJECT_NAME}_BUILD_TESTING ${BUILD_TESTING})
+  if(DEFINED BUILD_TESTING)
+    set(${PROJECT_NAME}_BUILD_TESTING ${BUILD_TESTING})
+  else()
+    set(${PROJECT_NAME}_BUILD_TESTING true)
+  endif()
+endif()
+
+if(benchmark)
+  set(${PROJECT_NAME}_BUILD_TESTING true)
 endif()
 
 if(${PROJECT_NAME}_BUILD_TESTING)
@@ -76,11 +85,10 @@ if(${PROJECT_NAME}_BUILD_TESTING)
   add_subdirectory(test)
 endif()
 
-if(ENABLE_BENCHMARKS)
+if(benchmark)
   add_subdirectory(benchmark)
 endif()
 
-
 # additional Find*.cmake necessary
 install(FILES
 ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindHDF5.cmake

diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt
@@ -29,9 +29,9 @@ add_library(partition OBJECT partition.f90)
 
 add_library(cli OBJECT cli.f90)
 
-add_executable(runner frontend.f90 cpu_count.cpp)
+add_executable(runner frontend.f90)
 target_include_directories(runner PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(runner PRIVATE partition cli)
+target_link_libraries(runner PRIVATE partition cli cpu_count)
 if(CMAKE_Fortran_COMPILER_ID MATCHES "^Intel")
   set_property(TARGET runner PROPERTY LINKER_LANGUAGE Fortran)
 else()

diff --git a/cmake/compilers.cmake b/cmake/compilers.cmake
@@ -37,7 +37,7 @@ $<$<COMPILE_LANGUAGE:Fortran>:-fimplicit-none>
 endif()
 
 # --- code coverage
-if(ENABLE_COVERAGE)
+if(coverage)
 include(CodeCoverage)
 append_coverage_compiler_flags()
 set(COVERAGE_EXCLUDES ${PROJECT_SOURCE_DIR}/test)

diff --git a/cmake/options.cmake b/cmake/options.cmake
@@ -1,7 +1,7 @@
 message(STATUS "${PROJECT_NAME} ${PROJECT_VERSION}  CMake ${CMAKE_VERSION}")
 
-option(ENABLE_BENCHMARKS "write / read benchmarks")
-option(ENABLE_COVERAGE "Code coverage tests")
+option(benchmark "Run benchmarks")
+option(coverage "Code coverage tests")
 option(hdf5_parallel "use HDF5-MPI layer" true)
 
 set(CMAKE_TLS_VERIFY true)

diff --git a/codemeta.json b/codemeta.json
@@ -3,11 +3,11 @@
     "@type": "SoftwareSourceCode",
     "codeRepository": "https://github.com/geospace-code/h5fortran-mpi",
     "contIntegration": "https://github.com/geospace-code/h5fortran-mpi/actions",
-    "dateModified": "2022-07-28",
+    "dateModified": "2022-07-29",
     "downloadUrl": "https://github.com/geospace-code/h5fortran-mpi/releases",
     "issueTracker": "https://github.com/geospace-code/h5fortran-mpi/issues",
     "name": "h5fortran-mpi",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "identifier": "10.5281/zenodo.5847354",
     "description": "Lightweight object-oriented HDF5-MPI parallel Fortran interface",
     "applicationCategory": "file I/O",

diff --git a/fpm.toml b/fpm.toml
@@ -1,7 +1,7 @@
 name = "h5fortran-mpi"
 description = "Lightweight object-oriented HDF5 MPI parallel interface"
 categories = "io"
-version = "2.0.0"
+version = "2.0.2"
 
 [build]
 auto-tests = false

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,3 +1,8 @@
+add_library(cpu_count OBJECT cpu_count.cpp)
+target_compile_features(cpu_count PRIVATE cxx_std_11)
+target_compile_definitions(cpu_count PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>)
+target_include_directories(cpu_count PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
 # --- Python h5py
 find_package(Python COMPONENTS Interpreter)
 if(NOT DEFINED h5py_ok)
@@ -29,7 +34,7 @@ if(hdf5_parallel)
   add_subdirectory(mpi)
 endif()
 
-if(ENABLE_COVERAGE)
+if(coverage)
   setup_target_for_coverage_gcovr_html(
   NAME coverage
   EXECUTABLE ${CMAKE_CTEST_COMMAND}

diff --git a/benchmark/cpu_count.cpp → test/cpu_count.cpp b/benchmark/cpu_count.cpp → test/cpu_count.cpp
@@ -19,6 +19,7 @@
 #include <thread>
 
 #ifdef _WIN32
+#define NOMINMAX
 #include <windows.h>
 #elif defined (__APPLE__)
 #include <sys/sysctl.h>

diff --git a/benchmark/cpu_count.h → test/cpu_count.h b/benchmark/cpu_count.h → test/cpu_count.h
diff --git a/test/mpi/CMakeLists.txt b/test/mpi/CMakeLists.txt
@@ -32,11 +32,11 @@ endfunction(mpi_test)
 # --- test files
 
 add_executable(test_runner runner.f90
-${PROJECT_SOURCE_DIR}/benchmark/cpu_count.cpp
 ${PROJECT_SOURCE_DIR}/benchmark/partition.f90
 ${PROJECT_SOURCE_DIR}/benchmark/cli.f90
 )
 target_include_directories(test_runner PRIVATE ${PROJECT_SOURCE_DIR}/benchmark)
+target_link_libraries(test_runner PRIVATE cpu_count)
 # not linked as libraries in case benchmarks aren't built
 if(CMAKE_Fortran_COMPILER_ID MATCHES "^Intel")
   set_property(TARGET test_runner PROPERTY LINKER_LANGUAGE Fortran)