Update cmake min version and cmake command convention
This commit is contained in:
Allen Byrne
@@ -1,7 +1,7 @@
|
||||
#-------------------------------------------------------------------------------
|
||||
macro (SET_GLOBAL_VARIABLE name value)
|
||||
set (${name} ${value} CACHE INTERNAL "Used to pass variables between directories" FORCE)
|
||||
endmacro (SET_GLOBAL_VARIABLE)
|
||||
endmacro ()
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
macro (IDE_GENERATED_PROPERTIES SOURCE_PATH HEADERS SOURCES)
|
||||
@@ -14,7 +14,7 @@ macro (IDE_GENERATED_PROPERTIES SOURCE_PATH HEADERS SOURCES)
|
||||
#set_property (SOURCE ${HEADERS}
|
||||
# PROPERTY MACOSX_PACKAGE_LOCATION Headers/${NAME}
|
||||
#)
|
||||
endmacro (IDE_GENERATED_PROPERTIES)
|
||||
endmacro ()
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
macro (IDE_SOURCE_PROPERTIES SOURCE_PATH HEADERS SOURCES)
|
||||
@@ -31,14 +31,14 @@ macro (IDE_SOURCE_PROPERTIES SOURCE_PATH HEADERS SOURCES)
|
||||
#set_property (SOURCE ${HEADERS}
|
||||
# PROPERTY MACOSX_PACKAGE_LOCATION Headers/${NAME}
|
||||
#)
|
||||
endmacro (IDE_SOURCE_PROPERTIES)
|
||||
endmacro ()
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
macro (TARGET_NAMING libtarget libtype)
|
||||
if (${libtype} MATCHES "SHARED")
|
||||
set_target_properties (${libtarget} PROPERTIES OUTPUT_NAME "${libtarget}${ARGN}")
|
||||
endif (${libtype} MATCHES "SHARED")
|
||||
endmacro (TARGET_NAMING)
|
||||
endif ()
|
||||
endmacro ()
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
macro (INSTALL_TARGET_PDB libtarget targetdestination targetcomponent)
|
||||
@@ -52,8 +52,8 @@ macro (INSTALL_TARGET_PDB libtarget targetdestination targetcomponent)
|
||||
CONFIGURATIONS RelWithDebInfo
|
||||
COMPONENT ${targetcomponent}
|
||||
)
|
||||
endif (WIN32 AND MSVC)
|
||||
endmacro (INSTALL_TARGET_PDB)
|
||||
endif ()
|
||||
endmacro ()
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
macro (INSTALL_PROGRAM_PDB progtarget targetdestination targetcomponent)
|
||||
@@ -68,8 +68,8 @@ macro (INSTALL_PROGRAM_PDB progtarget targetdestination targetcomponent)
|
||||
CONFIGURATIONS RelWithDebInfo
|
||||
COMPONENT ${targetcomponent}
|
||||
)
|
||||
endif (WIN32 AND MSVC)
|
||||
endmacro (INSTALL_PROGRAM_PDB)
|
||||
endif ()
|
||||
endmacro ()
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
macro (HDF_SET_LIB_OPTIONS libtarget libname libtype)
|
||||
@@ -77,19 +77,19 @@ macro (HDF_SET_LIB_OPTIONS libtarget libname libtype)
|
||||
if (WIN32)
|
||||
set (LIB_RELEASE_NAME "${libname}")
|
||||
set (LIB_DEBUG_NAME "${libname}_D")
|
||||
else (WIN32)
|
||||
else ()
|
||||
set (LIB_RELEASE_NAME "${libname}")
|
||||
set (LIB_DEBUG_NAME "${libname}_debug")
|
||||
endif (WIN32)
|
||||
endif ()
|
||||
else (${libtype} MATCHES "SHARED")
|
||||
if (WIN32)
|
||||
set (LIB_RELEASE_NAME "lib${libname}")
|
||||
set (LIB_DEBUG_NAME "lib${libname}_D")
|
||||
else (WIN32)
|
||||
else ()
|
||||
set (LIB_RELEASE_NAME "${libname}")
|
||||
set (LIB_DEBUG_NAME "${libname}_debug")
|
||||
endif (WIN32)
|
||||
endif (${libtype} MATCHES "SHARED")
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
set_target_properties (${libtarget}
|
||||
PROPERTIES
|
||||
@@ -107,9 +107,9 @@ macro (HDF_SET_LIB_OPTIONS libtarget libname libtype)
|
||||
IMPORT_PREFIX ""
|
||||
PREFIX ""
|
||||
)
|
||||
endif (MINGW AND ${libtype} MATCHES "SHARED")
|
||||
endif ()
|
||||
|
||||
endmacro (HDF_SET_LIB_OPTIONS)
|
||||
endmacro ()
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
macro (HDF_IMPORT_SET_LIB_OPTIONS libtarget libname libtype libversion)
|
||||
@@ -117,12 +117,12 @@ macro (HDF_IMPORT_SET_LIB_OPTIONS libtarget libname libtype libversion)
|
||||
|
||||
if (${importtype} MATCHES "IMPORT")
|
||||
set (importprefix "${CMAKE_STATIC_LIBRARY_PREFIX}")
|
||||
endif (${importtype} MATCHES "IMPORT")
|
||||
endif ()
|
||||
if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
|
||||
set (IMPORT_LIB_NAME ${LIB_DEBUG_NAME})
|
||||
else (${CMAKE_BUILD_TYPE} MATCHES "Debug")
|
||||
else ()
|
||||
set (IMPORT_LIB_NAME ${LIB_RELEASE_NAME})
|
||||
endif (${CMAKE_BUILD_TYPE} MATCHES "Debug")
|
||||
endif ()
|
||||
|
||||
if (${libtype} MATCHES "SHARED")
|
||||
if (WIN32)
|
||||
@@ -131,54 +131,54 @@ macro (HDF_IMPORT_SET_LIB_OPTIONS libtarget libname libtype libversion)
|
||||
IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${IMPORT_LIB_NAME}.lib"
|
||||
IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${IMPORT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
|
||||
)
|
||||
else (MINGW)
|
||||
else ()
|
||||
set_target_properties (${libtarget} PROPERTIES
|
||||
IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${IMPORT_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
|
||||
IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${CMAKE_IMPORT_LIBRARY_PREFIX}${IMPORT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
|
||||
)
|
||||
endif (MINGW)
|
||||
else (WIN32)
|
||||
endif ()
|
||||
else ()
|
||||
if (CYGWIN)
|
||||
set_target_properties (${libtarget} PROPERTIES
|
||||
IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_IMPORT_LIBRARY_PREFIX}${IMPORT_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
|
||||
IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_IMPORT_LIBRARY_PREFIX}${IMPORT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
|
||||
)
|
||||
else (CYGWIN)
|
||||
else ()
|
||||
set_target_properties (${libtarget} PROPERTIES
|
||||
IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}${IMPORT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
|
||||
IMPORTED_SONAME "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_SHARED_LIBRARY_PREFIX}${IMPORT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${libversion}"
|
||||
SOVERSION "${libversion}"
|
||||
)
|
||||
endif (CYGWIN)
|
||||
endif (WIN32)
|
||||
else (${libtype} MATCHES "SHARED")
|
||||
endif ()
|
||||
endif ()
|
||||
else ()
|
||||
if (WIN32 AND NOT MINGW)
|
||||
set_target_properties (${libtarget} PROPERTIES
|
||||
IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${IMPORT_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
|
||||
IMPORTED_LINK_INTERFACE_LANGUAGES "C"
|
||||
)
|
||||
else (WIN32 AND NOT MINGW)
|
||||
else ()
|
||||
set_target_properties (${libtarget} PROPERTIES
|
||||
IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_STATIC_LIBRARY_PREFIX}${IMPORT_LIB_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
|
||||
IMPORTED_LINK_INTERFACE_LANGUAGES "C"
|
||||
)
|
||||
endif (WIN32 AND NOT MINGW)
|
||||
endif (${libtype} MATCHES "SHARED")
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
endmacro (HDF_IMPORT_SET_LIB_OPTIONS)
|
||||
endmacro ()
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
macro (TARGET_C_PROPERTIES wintarget libtype addcompileflags addlinkflags)
|
||||
if (MSVC)
|
||||
TARGET_MSVC_PROPERTIES (${wintarget} ${libtype} "${addcompileflags} ${WIN_COMPILE_FLAGS}" "${addlinkflags} ${WIN_LINK_FLAGS}")
|
||||
else (MSVC)
|
||||
else ()
|
||||
set_target_properties (${wintarget}
|
||||
PROPERTIES
|
||||
COMPILE_FLAGS "${addcompileflags}"
|
||||
LINK_FLAGS "${addlinkflags}"
|
||||
)
|
||||
endif (MSVC)
|
||||
endmacro (TARGET_C_PROPERTIES)
|
||||
endif ()
|
||||
endmacro ()
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
macro (TARGET_MSVC_PROPERTIES wintarget libtype addcompileflags addlinkflags)
|
||||
@@ -188,15 +188,15 @@ macro (TARGET_MSVC_PROPERTIES wintarget libtype addcompileflags addlinkflags)
|
||||
COMPILE_FLAGS "${addcompileflags}"
|
||||
LINK_FLAGS "${addlinkflags}"
|
||||
)
|
||||
endif (MSVC)
|
||||
endmacro (TARGET_MSVC_PROPERTIES)
|
||||
endif ()
|
||||
endmacro ()
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
macro (TARGET_FORTRAN_PROPERTIES forttarget libtype addcompileflags addlinkflags)
|
||||
if (WIN32)
|
||||
TARGET_FORTRAN_WIN_PROPERTIES (${forttarget} ${libtype} "${addcompileflags} ${WIN_COMPILE_FLAGS}" "${addlinkflags} ${WIN_LINK_FLAGS}")
|
||||
endif (WIN32)
|
||||
endmacro (TARGET_FORTRAN_PROPERTIES)
|
||||
endif ()
|
||||
endmacro ()
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
macro (TARGET_FORTRAN_WIN_PROPERTIES forttarget libtype addcompileflags addlinkflags)
|
||||
@@ -207,15 +207,15 @@ macro (TARGET_FORTRAN_WIN_PROPERTIES forttarget libtype addcompileflags addlinkf
|
||||
COMPILE_FLAGS "/dll ${addcompileflags}"
|
||||
LINK_FLAGS "/SUBSYSTEM:CONSOLE ${addlinkflags}"
|
||||
)
|
||||
else (${libtype} MATCHES "SHARED")
|
||||
else ()
|
||||
set_target_properties (${forttarget}
|
||||
PROPERTIES
|
||||
COMPILE_FLAGS "${addcompileflags}"
|
||||
LINK_FLAGS "/SUBSYSTEM:CONSOLE ${addlinkflags}"
|
||||
)
|
||||
endif (${libtype} MATCHES "SHARED")
|
||||
endif (MSVC)
|
||||
endmacro (TARGET_FORTRAN_WIN_PROPERTIES)
|
||||
endif ()
|
||||
endif ()
|
||||
endmacro ()
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Configure the README.txt file for the binary package
|
||||
@@ -228,16 +228,16 @@ macro (HDF_README_PROPERTIES target_fortran)
|
||||
set (BINARY_INSTALL_ENDING "msi")
|
||||
if (CMAKE_CL_64)
|
||||
set (BINARY_SYSTEM_NAME "win64")
|
||||
else (CMAKE_CL_64)
|
||||
else ()
|
||||
set (BINARY_SYSTEM_NAME "win32")
|
||||
endif (CMAKE_CL_64)
|
||||
endif ()
|
||||
if (${CMAKE_SYSTEM_VERSION} MATCHES "6.1")
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM} 7")
|
||||
elseif (${CMAKE_SYSTEM_VERSION} MATCHES "6.2")
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM} 8")
|
||||
elseif (${CMAKE_SYSTEM_VERSION} MATCHES "6.3")
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM} 10")
|
||||
endif (${CMAKE_SYSTEM_VERSION} MATCHES "6.1")
|
||||
endif ()
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM} ${MSVC_C_ARCHITECTURE_ID}")
|
||||
if (${CMAKE_C_COMPILER_VERSION} MATCHES "16.*")
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2010")
|
||||
@@ -249,36 +249,36 @@ macro (HDF_README_PROPERTIES target_fortran)
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2013")
|
||||
elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "19.*")
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2015")
|
||||
else (${CMAKE_C_COMPILER_VERSION} MATCHES "16.*")
|
||||
else ()
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO ${CMAKE_C_COMPILER_VERSION}")
|
||||
endif (${CMAKE_C_COMPILER_VERSION} MATCHES "16.*")
|
||||
endif ()
|
||||
elseif (APPLE)
|
||||
set (BINARY_EXAMPLE_ENDING "tar.gz")
|
||||
set (BINARY_INSTALL_ENDING "dmg")
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM} ${CMAKE_SYSTEM_VERSION} ${CMAKE_SYSTEM_PROCESSOR}")
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using ${CMAKE_C_COMPILER_ID} C ${CMAKE_C_COMPILER_VERSION}")
|
||||
else (WIN32)
|
||||
else ()
|
||||
set (BINARY_EXAMPLE_ENDING "tar.gz")
|
||||
set (BINARY_INSTALL_ENDING "sh")
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM} ${CMAKE_SYSTEM_VERSION} ${CMAKE_SYSTEM_PROCESSOR}")
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM}, using ${CMAKE_C_COMPILER_ID} C ${CMAKE_C_COMPILER_VERSION}")
|
||||
endif (WIN32)
|
||||
endif ()
|
||||
|
||||
if (target_fortran)
|
||||
set (BINARY_PLATFORM "${BINARY_PLATFORM} / ${CMAKE_Fortran_COMPILER_ID} Fortran")
|
||||
endif (target_fortran)
|
||||
endif ()
|
||||
|
||||
if (BUILD_SHARED_LIBS)
|
||||
set (LIB_TYPE "Static and Shared")
|
||||
else (BUILD_SHARED_LIBS)
|
||||
else ()
|
||||
set (LIB_TYPE "Static")
|
||||
endif (BUILD_SHARED_LIBS)
|
||||
endif ()
|
||||
|
||||
configure_file (
|
||||
${HDF_RESOURCES_DIR}/README.txt.cmake.in
|
||||
${CMAKE_BINARY_DIR}/README.txt @ONLY
|
||||
)
|
||||
endmacro (HDF_README_PROPERTIES)
|
||||
endmacro ()
|
||||
|
||||
macro (HDFTEST_COPY_FILE src dest target)
|
||||
add_custom_command(
|
||||
|
||||
Reference in New Issue
Block a user