File tree 2 files changed +10
-13
lines changed 2 files changed +10
-13
lines changed Original file line number Diff line number Diff line change @@ -57,12 +57,10 @@ set(hdf5_cmake_args
57
57
-DHDF5_BUILD_CPP_LIB:BOOL =false
58
58
-DBUILD_TESTING:BOOL =false
59
59
-DHDF5_BUILD_EXAMPLES:BOOL =false
60
- -DHDF5_BUILD_TOOLS:BOOL =$< NOT :$< BOOL : ${hdf5_parallel} >>
60
+ -DHDF5_BUILD_TOOLS:BOOL =true
61
61
-DHDF5_ENABLE_PARALLEL:BOOL =$<BOOL :${hdf5_parallel} >
62
- -DHDF5_BUILD_PARALLEL_TOOLS:BOOL =false
62
+ -DHDF5_BUILD_PARALLEL_TOOLS:BOOL =$< BOOL : ${hdf5_parallel} >
63
63
)
64
- # https://github.com/HDFGroup/hdf5/issues/818 for broken ph5diff in HDF5_BUILD_TOOLS
65
- # avoid building tools as some HDF5 versions have build failures or broken tools
66
64
67
65
#-DHDF5_USE_GNU_DIRS:BOOL=ON # not yet, new for 1.14
68
66
Original file line number Diff line number Diff line change @@ -2,6 +2,14 @@ message(STATUS "${PROJECT_NAME} ${PROJECT_VERSION} CMake ${CMAKE_VERSION} Toolch
2
2
3
3
include (GNUInstallDirs)
4
4
5
+ # this is NECESSARY for CMake 3.21 -- parent projects will error on CMake configure!
6
+ if (CMAKE_VERSION VERSION_LESS 3.21)
7
+ get_property (not_top DIRECTORY PROPERTY PARENT_DIRECTORY )
8
+ if (NOT not_top)
9
+ set (PROJECT_IS_TOP_LEVEL true )
10
+ endif ()
11
+ endif ()
12
+
5
13
option (find "try to find libraries" on )
6
14
7
15
option (${PROJECT_NAME} _COVERAGE "Code coverage tests" )
@@ -12,17 +20,8 @@ option(concepts "conceptual testing, for devs only" off)
12
20
13
21
option (CMAKE_TLS_VERIFY "Verify TLS certificates" on )
14
22
15
- if (BUILD_SHARED_LIBS AND MSVC )
16
- message (WARNING "Intel oneAPI has trouble with shared libs in general on Windows, try
17
- cmake -DBUILD_SHARED_LIBS=off" )
18
- endif ()
19
-
20
23
option (h5fortran_BUILD_TESTING "build tests" ${PROJECT_IS_TOP_LEVEL} )
21
24
22
- if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND PROJECT_IS_TOP_LEVEL)
23
- set_property (CACHE CMAKE_INSTALL_PREFIX PROPERTY VALUE "${PROJECT_BINARY_DIR} /local" )
24
- endif ()
25
-
26
25
set_property (DIRECTORY PROPERTY EP_UPDATE_DISCONNECTED true )
27
26
28
27
# Necessary for shared library with Visual Studio / Windows oneAPI
You can’t perform that action at this time.
0 commit comments