-
-
Notifications
You must be signed in to change notification settings - Fork 261
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge CMake,doxygen changes from develop,1.10 branches (#3578)
* Merge CMake,doxygen changes from develop,1.10 branches * revert incorrect option in AT TS build * Use variable for ignore-eol usage. * Add last_test depends logic * Just print status on CMake below 3.14
- Loading branch information
Showing
43 changed files
with
2,004 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,7 @@ | |
| # If you do not have access to either file, you may request a copy from | ||
| # [email protected]. | ||
| # | ||
| option (USE_LIBAEC "Use AEC library as SZip Filter" OFF) | ||
| option (USE_LIBAEC "Use AEC library as SZip Filter" ON) | ||
| option (USE_LIBAEC_STATIC "Use static AEC library " OFF) | ||
| option (ZLIB_USE_EXTERNAL "Use External Library Building for ZLIB" 0) | ||
| option (SZIP_USE_EXTERNAL "Use External Library Building for SZIP" 0) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,14 +44,16 @@ set (${HDF5_PACKAGE_NAME}_ENABLE_PLUGIN_SUPPORT @HDF5_ENABLE_PLUGIN_SUPPORT@) | |
| set (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT @HDF5_ENABLE_Z_LIB_SUPPORT@) | ||
| set (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT @HDF5_ENABLE_SZIP_SUPPORT@) | ||
| set (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_ENCODING @HDF5_ENABLE_SZIP_ENCODING@) | ||
| set (${HDF5_PACKAGE_NAME}_ENABLE_ROS3_VFD @HDF5_ENABLE_ROS3_VFD@) | ||
| set (${HDF5_PACKAGE_NAME}_BUILD_SHARED_LIBS @H5_ENABLE_SHARED_LIB@) | ||
| set (${HDF5_PACKAGE_NAME}_BUILD_STATIC_LIBS @H5_ENABLE_STATIC_LIB@) | ||
| set (${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS @HDF5_PACKAGE_EXTLIBS@) | ||
| set (${HDF5_PACKAGE_NAME}_EXPORT_LIBRARIES @HDF5_LIBRARIES_TO_EXPORT@) | ||
| set (${HDF5_PACKAGE_NAME}_ARCHITECTURE "@CMAKE_GENERATOR_ARCHITECTURE@") | ||
| set (${HDF5_PACKAGE_NAME}_TOOLSET "@CMAKE_GENERATOR_TOOLSET@") | ||
| set (${HDF5_PACKAGE_NAME}_DEFAULT_API_VERSION "@DEFAULT_API_VERSION@") | ||
| set (${HDF5_PACKAGE_NAME}_PARALLEL_FILTERED_WRITES "@PARALLEL_FILTERED_WRITES@") | ||
| set (${HDF5_PACKAGE_NAME}_PARALLEL_FILTERED_WRITES @PARALLEL_FILTERED_WRITES@) | ||
| set (${HDF5_PACKAGE_NAME}_INSTALL_MOD_FORTRAN "@HDF5_INSTALL_MOD_FORTRAN@") | ||
|
|
||
| #----------------------------------------------------------------------------- | ||
| # Dependencies | ||
|
|
@@ -67,6 +69,11 @@ if (${HDF5_PACKAGE_NAME}_ENABLE_PARALLEL) | |
| find_package(MPI QUIET REQUIRED) | ||
| endif () | ||
|
|
||
| if (${HDF5_PACKAGE_NAME}_ENABLE_THREADSAFE) | ||
| set(THREADS_PREFER_PTHREAD_FLAG ON) | ||
| find_package(Threads QUIET REQUIRED) | ||
| endif () | ||
|
|
||
| if (${HDF5_PACKAGE_NAME}_BUILD_JAVA) | ||
| set (${HDF5_PACKAGE_NAME}_JAVA_INCLUDE_DIRS | ||
| @PACKAGE_CURRENT_BUILD_DIR@/lib/jarhdf5-@[email protected] | ||
|
|
@@ -143,14 +150,14 @@ foreach (comp IN LISTS ${HDF5_PACKAGE_NAME}_FIND_COMPONENTS) | |
| list (REMOVE_ITEM ${HDF5_PACKAGE_NAME}_FIND_COMPONENTS ${comp}) | ||
| set (${HDF5_PACKAGE_NAME}_LIB_TYPE ${${HDF5_PACKAGE_NAME}_LIB_TYPE} ${comp}) | ||
|
|
||
| if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN) | ||
| if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN AND ${HDF5_PACKAGE_NAME}_INSTALL_MOD_FORTRAN STREQUAL "SHARED") | ||
| set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_FORTRAN "@PACKAGE_INCLUDE_INSTALL_DIR@/shared") | ||
| endif () | ||
| elseif (comp STREQUAL "static") | ||
| list (REMOVE_ITEM ${HDF5_PACKAGE_NAME}_FIND_COMPONENTS ${comp}) | ||
| set (${HDF5_PACKAGE_NAME}_LIB_TYPE ${${HDF5_PACKAGE_NAME}_LIB_TYPE} ${comp}) | ||
|
|
||
| if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN) | ||
| if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN AND ${HDF5_PACKAGE_NAME}_INSTALL_MOD_FORTRAN STREQUAL "STATIC") | ||
| set (${HDF5_PACKAGE_NAME}_INCLUDE_DIR_FORTRAN "@PACKAGE_INCLUDE_INSTALL_DIR@/static") | ||
| endif () | ||
| endif () | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -304,4 +304,4 @@ file(GLOB_RECURSE CMAKE_FILES | |
| ) | ||
| cmake_format(TARGET_NAME ${CMAKE_FILES}) | ||
| ``` | ||
| ``` | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| # Uncomment the following to use cross-compiling | ||
| #set(CMAKE_SYSTEM_NAME Linux) | ||
| #set (CMAKE_SYSTEM_NAME Linux) | ||
|
|
||
| set(CMAKE_COMPILER_VENDOR "clang") | ||
| set (CMAKE_COMPILER_VENDOR "clang") | ||
|
|
||
| if(WIN32) | ||
| set(CMAKE_C_COMPILER clang-cl) | ||
| set(CMAKE_CXX_COMPILER clang-cl) | ||
| set (CMAKE_C_COMPILER clang-cl) | ||
| set (CMAKE_CXX_COMPILER clang-cl) | ||
| else() | ||
| set(CMAKE_C_COMPILER clang) | ||
| set(CMAKE_CXX_COMPILER clang++) | ||
| set (CMAKE_C_COMPILER clang) | ||
| set (CMAKE_CXX_COMPILER clang++) | ||
| endif() | ||
| set(CMAKE_EXPORT_COMPILE_COMMANDS ON) | ||
| set (CMAKE_EXPORT_COMPILE_COMMANDS ON) | ||
|
|
||
| # the following is used if cross-compiling | ||
| set(CMAKE_CROSSCOMPILING_EMULATOR "") | ||
| set (CMAKE_CROSSCOMPILING_EMULATOR "") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| # The following line will use cross-compiling | ||
| set(CMAKE_SYSTEM_NAME Linux) | ||
| set (CMAKE_SYSTEM_NAME Linux) | ||
|
|
||
| set(CMAKE_COMPILER_VENDOR "CrayLinuxEnvironment") | ||
| set (CMAKE_COMPILER_VENDOR "CrayLinuxEnvironment") | ||
|
|
||
| set(CMAKE_C_COMPILER cc) | ||
| set(CMAKE_Fortran_COMPILER ftn) | ||
| set (CMAKE_C_COMPILER cc) | ||
| set (CMAKE_Fortran_COMPILER ftn) | ||
|
|
||
| # the following is used if cross-compiling | ||
| set(CMAKE_CROSSCOMPILING_EMULATOR "") | ||
| set (CMAKE_CROSSCOMPILING_EMULATOR "") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| # Uncomment the following line and the correct system name to use cross-compiling | ||
| #set(CMAKE_SYSTEM_NAME Linux) | ||
| #set (CMAKE_SYSTEM_NAME Linux) | ||
|
|
||
| set(CMAKE_COMPILER_VENDOR "GCC") | ||
| set (CMAKE_COMPILER_VENDOR "GCC") | ||
|
|
||
| set(CMAKE_C_COMPILER cc) | ||
| set(CMAKE_CXX_COMPILER c++) | ||
| set(CMAKE_Fortran_COMPILER gfortran) | ||
| set (CMAKE_C_COMPILER cc) | ||
| set (CMAKE_CXX_COMPILER c++) | ||
| set (CMAKE_Fortran_COMPILER gfortran) | ||
|
|
||
| # the following is used if cross-compiling | ||
| set(CMAKE_CROSSCOMPILING_EMULATOR "") | ||
| set (CMAKE_CROSSCOMPILING_EMULATOR "") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| # Uncomment the following to use cross-compiling | ||
| #set(CMAKE_SYSTEM_NAME Linux) | ||
| #set (CMAKE_SYSTEM_NAME Linux) | ||
|
|
||
| set(CMAKE_COMPILER_VENDOR "PGI") | ||
| set (CMAKE_COMPILER_VENDOR "PGI") | ||
|
|
||
| set(CMAKE_C_COMPILER pgcc) | ||
| set(CMAKE_CXX_COMPILER pgc++) | ||
| set(CMAKE_Fortran_COMPILER pgf90) | ||
| set (CMAKE_C_COMPILER pgcc) | ||
| set (CMAKE_CXX_COMPILER pgc++) | ||
| set (CMAKE_Fortran_COMPILER pgf90) | ||
|
|
||
| # the following is used if cross-compiling | ||
| set(CMAKE_CROSSCOMPILING_EMULATOR "") | ||
| set (CMAKE_CROSSCOMPILING_EMULATOR "") |
Oops, something went wrong.