Skip to content

Commit

Permalink
Revert "Revert "update to HDF5-1.12.2; goal is to activate compressio…
Browse files Browse the repository at this point in the history 
…n plugins""

This reverts commit 50f8c43.
  • Loading branch information
@marcdegraef
marcdegraef committed Nov 4, 2022
1 parent 50f8c43 commit e4f2d84
Show file tree
Hide file tree
Showing 16 changed files with 348 additions and 340 deletions.
46 changes: 23 additions & 23 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,16 @@ if(MSVC12)
endif(MSVC12)


if( "${EMsoft_SDK}" STREQUAL "")
message(FATAL_ERROR "Please specify the EMsoft_SDK cmake variable which is the top level directory where all the EMsoft dependent libraries will be built")
if( "${EMsoftOO_SDK}" STREQUAL "")
message(FATAL_ERROR "Please specify the EMsoftOO_SDK cmake variable which is the top level directory where all the EMsoft dependent libraries will be built")
endif()

set(EMsoft_SDK_FILE ${EMsoft_SDK}/EMsoft_SDK.cmake)
set(download_dir ${EMsoft_SDK})
set(EMsoftOO_SDK_FILE ${EMsoftOO_SDK}/EMsoftOO_SDK.cmake)
set(download_dir ${EMsoftOO_SDK})


message(STATUS "EMsoft_SDK Folder: ${EMsoft_SDK}")
message(STATUS "EMsoft_SDK_FILE: ${EMsoft_SDK_FILE}")
message(STATUS "EMsoftOO_SDK Folder: ${EMsoftOO_SDK}")
message(STATUS "EMsoftOO_SDK_FILE: ${EMsoftOO_SDK_FILE}")


set(CLONE_EMSOFT_REPO 1)
Expand Down Expand Up @@ -122,8 +122,8 @@ if(APPLE)
endif()


configure_file(${CMAKE_CURRENT_SOURCE_DIR}/projects/apple/OSX_EMsoft_SDK.cmake
${EMsoft_SDK}/EMsoft_SDK.cmake @ONLY )
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/projects/apple/OSX_EMsoftOO_SDK.cmake
${EMsoftOO_SDK}/EMsoftOO_SDK.cmake @ONLY )
elseif(WIN32)
if(MSVC90)
message(FATAL_ERROR "Visual Studio Version 9 2009 is NOT supported.")
Expand All @@ -140,24 +140,24 @@ elseif(WIN32)
if( ${MSVC_VERSION} EQUAL "1900")
message(FATAL_ERROR "Visual Studio Version 14 2015 is NOT supported.")
endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/projects/win32/WIN_EMsoft_SDK.cmake
${EMsoft_SDK}/EMsoft_SDK.cmake COPYONLY )
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/projects/win32/WIN_EMsoftOO_SDK.cmake
${EMsoftOO_SDK}/EMsoftOO_SDK.cmake COPYONLY )
else()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/projects/unix/Linux_EMsoft_SDK.cmake
${EMsoft_SDK}/EMsoft_SDK.cmake COPYONLY )
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/projects/unix/Linux_EMsoftOO_SDK.cmake
${EMsoftOO_SDK}/EMsoftOO_SDK.cmake COPYONLY )
endif()

FILE(APPEND ${EMsoft_SDK_FILE} "\n#--------------------------------------------------------------------------------------------------\n")
FILE(APPEND ${EMsoft_SDK_FILE} "set(EMsoft_SDK_ROOT \"${EMsoft_SDK}\")\n")
FILE(APPEND ${EMsoft_SDK_FILE} "set(EMsoft_SDK_VERSION ${EMsoft_SDK_VERSION})\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "\n#--------------------------------------------------------------------------------------------------\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "set(EMsoftOO_SDK_ROOT \"${EMsoftOO_SDK}\")\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "set(EMsoftOO_SDK_VERSION ${EMsoftOO_SDK_VERSION})\n")

FILE(APPEND ${EMsoft_SDK_FILE} "\n#--------------------------------------------------------------------------------------------------\n")
FILE(APPEND ${EMsoft_SDK_FILE} "# EMsoft does not use QtWebEngine to render the docs anymore. Let the system do it.\n")
FILE(APPEND ${EMsoft_SDK_FILE} "set(EMsoftWorkbench_USE_QtWebEngine OFF)\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "\n#--------------------------------------------------------------------------------------------------\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "# EMsoft does not use QtWebEngine to render the docs anymore. Let the system do it.\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "set(EMsoftWorkbench_USE_QtWebEngine OFF)\n")

FILE(APPEND ${EMsoft_SDK_FILE} "\n#--------------------------------------------------------------------------------------------------\n")
FILE(APPEND ${EMsoft_SDK_FILE} "# Always write out the compile_commands.json file to help out things like QtCreator and VS Code\n")
FILE(APPEND ${EMsoft_SDK_FILE} "set(CMAKE_EXPORT_COMPILE_COMMANDS ON)\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "\n#--------------------------------------------------------------------------------------------------\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "# Always write out the compile_commands.json file to help out things like QtCreator and VS Code\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "set(CMAKE_EXPORT_COMPILE_COMMANDS ON)\n")


#------------------------------------------------------------------------------
Expand All @@ -173,8 +173,8 @@ elseif (${Fortran_COMPILER_NAME} MATCHES "ifort.*")
set(OSX_DEPLOYMENT_TARGET "10.13")
include(MKL)
else()
message(STATUS "The Fotran compiler is NOT recognized. EMsoft may not support it.")
message(FATAL_ERROR "Current Fotran Compiler is ${CMAKE_Fortran_COMPILER}")
message(STATUS "The Fortran compiler is NOT recognized. EMsoftOO may not support it.")
message(FATAL_ERROR "Current Fortran Compiler is ${CMAKE_Fortran_COMPILER}")
endif()

include(nlopt)
Expand Down
46 changes: 23 additions & 23 deletions projects/Bcls.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ set(BCLS_GIT_TAG "develop")
message(STATUS "Building: ${extProjectName} ${bcls_VERSION}: -DBUILD_BCLS=${BUILD_BCLS}" )

if(MSVC_IDE)
set(bcls_INSTALL "${EMsoft_SDK}/${extProjectName}-${bcls_VERSION}")
set(bcls_INSTALL "${EMsoftOO_SDK}/${extProjectName}-${bcls_VERSION}")
elseif(WIN32)
set(bcls_INSTALL "${EMsoft_SDK}/${extProjectName}-${bcls_VERSION}-${CMAKE_BUILD_TYPE}")
set(bcls_INSTALL "${EMsoftOO_SDK}/${extProjectName}-${bcls_VERSION}-${CMAKE_BUILD_TYPE}")
else()
set(bcls_INSTALL "${EMsoft_SDK}/${extProjectName}-${bcls_VERSION}-${CMAKE_BUILD_TYPE}")
set(bcls_INSTALL "${EMsoftOO_SDK}/${extProjectName}-${bcls_VERSION}-${CMAKE_BUILD_TYPE}")
endif()

if( CMAKE_BUILD_TYPE MATCHES Debug )
set(bcls_SUFFIX "_debug")
ENDif( CMAKE_BUILD_TYPE MATCHES Debug )

set_property(DIRECTORY PROPERTY EP_BASE ${EMsoft_SDK}/superbuild)
set_property(DIRECTORY PROPERTY EP_BASE ${EMsoftOO_SDK}/superbuild)

#-------------------------------------------------------------------------------
# We only support Intel Visual Fortran 2018 and newer since those have a sane
Expand Down Expand Up @@ -61,11 +61,11 @@ ExternalProject_Add(${extProjectName}
#URL ${bcls_URL}
GIT_REPOSITORY http://www.github.com/bluequartzsoftware/bcls
GIT_TAG "${BCLS_GIT_TAG}"
TMP_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/tmp/${CMAKE_BUILD_TYPE}"
STAMP_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Stamp/${CMAKE_BUILD_TYPE}"
DOWNLOAD_DIR ${EMsoft_SDK}/superbuild/${extProjectName}
SOURCE_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Source/${extProjectName}"
BINARY_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Build/${CMAKE_BUILD_TYPE}"
TMP_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/tmp/${CMAKE_BUILD_TYPE}"
STAMP_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Stamp/${CMAKE_BUILD_TYPE}"
DOWNLOAD_DIR ${EMsoftOO_SDK}/superbuild/${extProjectName}
SOURCE_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Source/${extProjectName}"
BINARY_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Build/${CMAKE_BUILD_TYPE}"
INSTALL_DIR "${bcls_INSTALL}"

CMAKE_ARGS
Expand All @@ -88,23 +88,23 @@ ExternalProject_Add(${extProjectName}
)


#-- Append this information to the EMsoft_SDK CMake file that helps other developers
#-- Append this information to the EMsoftOO_SDK CMake file that helps other developers
#-- configure EMsoft for building
FILE(APPEND ${EMsoft_SDK_FILE} "\n")
FILE(APPEND ${EMsoft_SDK_FILE} "#--------------------------------------------------------------------------------------------------\n")
FILE(APPEND ${EMsoft_SDK_FILE} "# bcls Library Location\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "#--------------------------------------------------------------------------------------------------\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "# bcls Library Location\n")
if(APPLE)
FILE(APPEND ${EMsoft_SDK_FILE} "set(bcls_INSTALL \"\${EMsoft_SDK_ROOT}/${extProjectName}-${bcls_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n")
FILE(APPEND ${EMsoft_SDK_FILE} "set(bcls_DIR \"\${EMsoft_SDK_ROOT}/${extProjectName}-${bcls_VERSION}-\${BUILD_TYPE}/lib/cmake/bcls\" CACHE PATH \"\")\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "set(bcls_INSTALL \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${bcls_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "set(bcls_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${bcls_VERSION}-\${BUILD_TYPE}/lib/cmake/bcls\" CACHE PATH \"\")\n")
elseif(MSVC_IDE)
FILE(APPEND ${EMsoft_SDK_FILE} "set(bcls_INSTALL \"\${EMsoft_SDK_ROOT}/${extProjectName}-${bcls_VERSION}\" CACHE PATH \"\")\n")
FILE(APPEND ${EMsoft_SDK_FILE} "set(bcls_DIR \"\${EMsoft_SDK_ROOT}/${extProjectName}-${bcls_VERSION}/lib/cmake/bcls\" CACHE PATH \"\")\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "set(bcls_INSTALL \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${bcls_VERSION}\" CACHE PATH \"\")\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "set(bcls_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${bcls_VERSION}/lib/cmake/bcls\" CACHE PATH \"\")\n")
elseif(WIN32)
FILE(APPEND ${EMsoft_SDK_FILE} "set(bcls_INSTALL \"\${EMsoft_SDK_ROOT}/${extProjectName}-${bcls_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n")
FILE(APPEND ${EMsoft_SDK_FILE} "set(bcls_DIR \"\${EMsoft_SDK_ROOT}/${extProjectName}-${bcls_VERSION}-\${BUILD_TYPE}/lib/cmake/bcls\" CACHE PATH \"\")\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "set(bcls_INSTALL \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${bcls_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "set(bcls_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${bcls_VERSION}-\${BUILD_TYPE}/lib/cmake/bcls\" CACHE PATH \"\")\n")
else()
FILE(APPEND ${EMsoft_SDK_FILE} "set(bcls_INSTALL \"\${EMsoft_SDK_ROOT}/${extProjectName}-${bcls_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n")
FILE(APPEND ${EMsoft_SDK_FILE} "set(bcls_DIR \"\${EMsoft_SDK_ROOT}/${extProjectName}-${bcls_VERSION}-\${BUILD_TYPE}/lib/cmake/bcls\" CACHE PATH \"\")\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "set(bcls_INSTALL \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${bcls_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "set(bcls_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${bcls_VERSION}-\${BUILD_TYPE}/lib/cmake/bcls\" CACHE PATH \"\")\n")
endif()
FILE(APPEND ${EMsoft_SDK_FILE} "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \${bcls_DIR})\n")
FILE(APPEND ${EMsoft_SDK_FILE} "Check3rdPartyDir(DIR \${bcls_DIR})\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \${bcls_DIR})\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "Check3rdPartyDir(DIR \${bcls_DIR})\n")
60 changes: 30 additions & 30 deletions projects/CLFortran.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ message(STATUS "Building: ${extProjectName} ${CLFortran_VERSION}: -DBUILD_CLFort


if(MSVC_IDE)
set(CLFortran_INSTALL "${EMsoft_SDK}/${extProjectName}-${CLFortran_VERSION}")
set(CLFortran_INSTALL "${EMsoftOO_SDK}/${extProjectName}-${CLFortran_VERSION}")
elseif(WIN32)
set(CLFortran_INSTALL "${EMsoft_SDK}/${extProjectName}-${CLFortran_VERSION}-${CMAKE_BUILD_TYPE}")
set(CLFortran_INSTALL "${EMsoftOO_SDK}/${extProjectName}-${CLFortran_VERSION}-${CMAKE_BUILD_TYPE}")
else()
set(CLFortran_INSTALL "${EMsoft_SDK}/${extProjectName}-${CLFortran_VERSION}-${CMAKE_BUILD_TYPE}")
set(CLFortran_INSTALL "${EMsoftOO_SDK}/${extProjectName}-${CLFortran_VERSION}-${CMAKE_BUILD_TYPE}")
endif()

if( CMAKE_BUILD_TYPE MATCHES Debug )
set(CLFortran_SUFFIX "_debug")
ENDif( CMAKE_BUILD_TYPE MATCHES Debug )

set_property(DIRECTORY PROPERTY EP_BASE ${EMsoft_SDK}/superbuild)
set_property(DIRECTORY PROPERTY EP_BASE ${EMsoftOO_SDK}/superbuild)

if(WIN32)
set(MIN_CUDA_VERSION "10.0")
Expand Down Expand Up @@ -71,11 +71,11 @@ ExternalProject_Add(${extProjectName}
#URL ${CLFortran_URL}
GIT_REPOSITORY http://www.github.com/bluequartzsoftware/clfortran
GIT_TAG "develop"
TMP_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/tmp/${CMAKE_BUILD_TYPE}"
STAMP_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Stamp/${CMAKE_BUILD_TYPE}"
DOWNLOAD_DIR ${EMsoft_SDK}/superbuild/${extProjectName}
SOURCE_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Source/${extProjectName}"
BINARY_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Build/${CMAKE_BUILD_TYPE}"
TMP_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/tmp/${CMAKE_BUILD_TYPE}"
STAMP_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Stamp/${CMAKE_BUILD_TYPE}"
DOWNLOAD_DIR ${EMsoftOO_SDK}/superbuild/${extProjectName}
SOURCE_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Source/${extProjectName}"
BINARY_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Build/${CMAKE_BUILD_TYPE}"
INSTALL_DIR "${CLFortran_INSTALL}"

CMAKE_ARGS
Expand All @@ -98,35 +98,35 @@ ExternalProject_Add(${extProjectName}

#--------------------------------------------------------------------------------------------------
# FORTRAN CL Library
# set(CLFortran_INSTALL "${EMsoft_SDK_ROOT}/CLFortran")
# set(CLFortran_DIR "${EMsoft_SDK_ROOT}/CLFortran/lib/CMake/CLFortran")
# set(CLFortran_INSTALL "${EMsoftOO_SDK_ROOT}/CLFortran")
# set(CLFortran_DIR "${EMsoftOO_SDK_ROOT}/CLFortran/lib/CMake/CLFortran")
if(WIN32)
FILE(APPEND ${EMsoft_SDK_FILE} "\n")
FILE(APPEND ${EMsoft_SDK_FILE} "#--------------------------------------------------------------------------------------------------\n")
FILE(APPEND ${EMsoft_SDK_FILE} "# OpenCL Library and Include directories\n")
FILE(APPEND ${EMsoft_SDK_FILE} "set(OpenCL_LIBRARY \"${OpenCL_LIBRARY}\")\n")
FILE(APPEND ${EMsoft_SDK_FILE} "set(OpenCL_INCLUDE_DIR \"${OpenCL_INCLUDE_DIR}\")\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "#--------------------------------------------------------------------------------------------------\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "# OpenCL Library and Include directories\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "set(OpenCL_LIBRARY \"${OpenCL_LIBRARY}\")\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "set(OpenCL_INCLUDE_DIR \"${OpenCL_INCLUDE_DIR}\")\n")

endif()

#-- Append this information to the EMsoft_SDK CMake file that helps other developers
#-- Append this information to the EMsoftOO_SDK CMake file that helps other developers
#-- configure EMsoft for building
FILE(APPEND ${EMsoft_SDK_FILE} "\n")
FILE(APPEND ${EMsoft_SDK_FILE} "#--------------------------------------------------------------------------------------------------\n")
FILE(APPEND ${EMsoft_SDK_FILE} "# CLFORTRAN Library Location\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "#--------------------------------------------------------------------------------------------------\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "# CLFORTRAN Library Location\n")
if(APPLE)
FILE(APPEND ${EMsoft_SDK_FILE} "set(CLFortran_INSTALL \"\${EMsoft_SDK_ROOT}/${extProjectName}-${CLFortran_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n")
FILE(APPEND ${EMsoft_SDK_FILE} "set(CLFortran_DIR \"\${EMsoft_SDK_ROOT}/${extProjectName}-${CLFortran_VERSION}-\${BUILD_TYPE}/lib/cmake/CLFortran\" CACHE PATH \"\")\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "set(CLFortran_INSTALL \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${CLFortran_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "set(CLFortran_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${CLFortran_VERSION}-\${BUILD_TYPE}/lib/cmake/CLFortran\" CACHE PATH \"\")\n")
elseif(MSVC_IDE)
FILE(APPEND ${EMsoft_SDK_FILE} "set(CLFortran_INSTALL \"\${EMsoft_SDK_ROOT}/${extProjectName}-${CLFortran_VERSION}\" CACHE PATH \"\")\n")
FILE(APPEND ${EMsoft_SDK_FILE} "set(CLFortran_DIR \"\${EMsoft_SDK_ROOT}/${extProjectName}-${CLFortran_VERSION}/lib/cmake/CLFortran\" CACHE PATH \"\")\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "set(CLFortran_INSTALL \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${CLFortran_VERSION}\" CACHE PATH \"\")\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "set(CLFortran_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${CLFortran_VERSION}/lib/cmake/CLFortran\" CACHE PATH \"\")\n")
elseif(WIN32)
FILE(APPEND ${EMsoft_SDK_FILE} "set(CLFortran_INSTALL \"\${EMsoft_SDK_ROOT}/${extProjectName}-${CLFortran_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n")
FILE(APPEND ${EMsoft_SDK_FILE} "set(CLFortran_DIR \"\${EMsoft_SDK_ROOT}/${extProjectName}-${CLFortran_VERSION}-\${BUILD_TYPE}/lib/cmake/CLFortran\" CACHE PATH \"\")\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "set(CLFortran_INSTALL \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${CLFortran_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "set(CLFortran_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${CLFortran_VERSION}-\${BUILD_TYPE}/lib/cmake/CLFortran\" CACHE PATH \"\")\n")
else()
FILE(APPEND ${EMsoft_SDK_FILE} "set(CLFortran_INSTALL \"\${EMsoft_SDK_ROOT}/${extProjectName}-${CLFortran_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n")
FILE(APPEND ${EMsoft_SDK_FILE} "set(CLFortran_DIR \"\${EMsoft_SDK_ROOT}/${extProjectName}-${CLFortran_VERSION}-\${BUILD_TYPE}/lib/cmake/CLFortran\" CACHE PATH \"\")\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "set(CLFortran_INSTALL \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${CLFortran_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "set(CLFortran_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${CLFortran_VERSION}-\${BUILD_TYPE}/lib/cmake/CLFortran\" CACHE PATH \"\")\n")
endif()
FILE(APPEND ${EMsoft_SDK_FILE} "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \${CLFortran_DIR})\n")
FILE(APPEND ${EMsoft_SDK_FILE} "Check3rdPartyDir(DIR \${CLFortran_DIR})\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \${CLFortran_DIR})\n")
FILE(APPEND ${EMsoftOO_SDK_FILE} "Check3rdPartyDir(DIR \${CLFortran_DIR})\n")

Loading

0 comments on commit e4f2d84

Please sign in to comment.