From 6d82a8a0a0f4279543a83638cbfd111951fb83ac Mon Sep 17 00:00:00 2001 From: Marc DeGraef Date: Fri, 4 Nov 2022 12:31:55 -0400 Subject: [PATCH] update to HDF5-1.12.2; goal is to activate compression plugins --- CMakeLists.txt | 46 +++++----- projects/Bcls.cmake | 46 +++++----- projects/CLFortran.cmake | 60 ++++++------- projects/EbsdLib.cmake | 50 +++++------ projects/Eigen.cmake | 28 +++--- projects/FFTW.cmake | 76 ++++++++-------- projects/HDF5.cmake | 64 +++++++------ projects/JsonFortran.cmake | 54 +++++------ projects/MKL.cmake | 36 ++++---- projects/Qt5.cmake | 90 +++++++++---------- projects/TBB.cmake | 44 ++++----- ...Msoft_SDK.cmake => OSX_EMsoftOO_SDK.cmake} | 10 +-- projects/ghcFilesystem.cmake | 26 +++--- projects/nlopt.cmake | 36 ++++---- ...oft_SDK.cmake => Linux_EMsoftOO_SDK.cmake} | 12 +-- ...Msoft_SDK.cmake => WIN_EMsoftOO_SDK.cmake} | 10 +-- 16 files changed, 348 insertions(+), 340 deletions(-) rename projects/apple/{OSX_EMsoft_SDK.cmake => OSX_EMsoftOO_SDK.cmake} (85%) rename projects/unix/{Linux_EMsoft_SDK.cmake => Linux_EMsoftOO_SDK.cmake} (84%) rename projects/win32/{WIN_EMsoft_SDK.cmake => WIN_EMsoftOO_SDK.cmake} (83%) diff --git a/CMakeLists.txt b/CMakeLists.txt index e0e673a..ec77546 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) @@ -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.") @@ -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") #------------------------------------------------------------------------------ @@ -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) diff --git a/projects/Bcls.cmake b/projects/Bcls.cmake index 5264280..1435383 100644 --- a/projects/Bcls.cmake +++ b/projects/Bcls.cmake @@ -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 @@ -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 @@ -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") diff --git a/projects/CLFortran.cmake b/projects/CLFortran.cmake index be2b479..0101289 100644 --- a/projects/CLFortran.cmake +++ b/projects/CLFortran.cmake @@ -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") @@ -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 @@ -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") diff --git a/projects/EbsdLib.cmake b/projects/EbsdLib.cmake index 5183536..1c772e1 100644 --- a/projects/EbsdLib.cmake +++ b/projects/EbsdLib.cmake @@ -5,18 +5,18 @@ set(EbsdLib_VERSION "2.0") set(GIT_HASH "develop") if(MSVC_IDE) - set(EbsdLib_INSTALL "${EMsoft_SDK}/${extProjectName}-${EbsdLib_VERSION}") + set(EbsdLib_INSTALL "${EMsoftOO_SDK}/${extProjectName}-${EbsdLib_VERSION}") elseif(WIN32) - set(EbsdLib_INSTALL "${EMsoft_SDK}/${extProjectName}-${EbsdLib_VERSION}-${CMAKE_BUILD_TYPE}") + set(EbsdLib_INSTALL "${EMsoftOO_SDK}/${extProjectName}-${EbsdLib_VERSION}-${CMAKE_BUILD_TYPE}") else() - set(EbsdLib_INSTALL "${EMsoft_SDK}/${extProjectName}-${EbsdLib_VERSION}-${CMAKE_BUILD_TYPE}") + set(EbsdLib_INSTALL "${EMsoftOO_SDK}/${extProjectName}-${EbsdLib_VERSION}-${CMAKE_BUILD_TYPE}") endif() if( CMAKE_BUILD_TYPE MATCHES Debug ) set(EbsdLib_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) set(DEPENDS Eigen tbb) if(TARGET ghcFilesystem) @@ -34,11 +34,11 @@ ExternalProject_Add(${extProjectName} DEPENDS ${DEPENDS} GIT_REPOSITORY http://www.github.com/bluequartzsoftware/EbsdLib GIT_TAG "${GIT_HASH}" - 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 "${EbsdLib_INSTALL}" CMAKE_ARGS @@ -49,8 +49,8 @@ ExternalProject_Add(${extProjectName} -DCMAKE_OSX_SYSROOT:PATH=${OSX_SDK} -DEigen3_DIR:PATH=${Eigen3_DIR} -DEbsdLib_ENABLE_HDF5:BOOL=OFF - -DghcFilesystem_DIR:PATH=${EMsoft_SDK}/ghcFilesystem-1.3.2/lib/cmake/ghcFilesystem - -DTBB_DIR:PATH=${EMsoft_SDK}/tbb-${tbb_VERSION}-${tbb_os_name}/tbb/cmake + -DghcFilesystem_DIR:PATH=${EMsoftOO_SDK}/ghcFilesystem-1.3.2/lib/cmake/ghcFilesystem + -DTBB_DIR:PATH=${EMsoftOO_SDK}/tbb-${tbb_VERSION}-${tbb_os_name}/tbb/cmake LOG_DOWNLOAD 1 LOG_UPDATE 1 @@ -61,23 +61,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} "# EbsdLib Library Location\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "#--------------------------------------------------------------------------------------------------\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "# EbsdLib Library Location\n") if(APPLE) - FILE(APPEND ${EMsoft_SDK_FILE} "set(EbsdLib_INSTALL \"\${EMsoft_SDK_ROOT}/${extProjectName}-${EbsdLib_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(EbsdLib_DIR \"\${EMsoft_SDK_ROOT}/${extProjectName}-${EbsdLib_VERSION}-\${BUILD_TYPE}/share/cmake/EbsdLib\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(EbsdLib_INSTALL \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${EbsdLib_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(EbsdLib_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${EbsdLib_VERSION}-\${BUILD_TYPE}/share/cmake/EbsdLib\" CACHE PATH \"\")\n") elseif(MSVC_IDE) - FILE(APPEND ${EMsoft_SDK_FILE} "set(EbsdLib_INSTALL \"\${EMsoft_SDK_ROOT}/${extProjectName}-${EbsdLib_VERSION}\" CACHE PATH \"\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(EbsdLib_DIR \"\${EMsoft_SDK_ROOT}/${extProjectName}-${EbsdLib_VERSION}/share/cmake/EbsdLib\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(EbsdLib_INSTALL \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${EbsdLib_VERSION}\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(EbsdLib_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${EbsdLib_VERSION}/share/cmake/EbsdLib\" CACHE PATH \"\")\n") elseif(WIN32) - FILE(APPEND ${EMsoft_SDK_FILE} "set(EbsdLib_INSTALL \"\${EMsoft_SDK_ROOT}/${extProjectName}-${EbsdLib_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(EbsdLib_DIR \"\${EMsoft_SDK_ROOT}/${extProjectName}-${EbsdLib_VERSION}-\${BUILD_TYPE}/share/cmake/EbsdLib\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(EbsdLib_INSTALL \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${EbsdLib_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(EbsdLib_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${EbsdLib_VERSION}-\${BUILD_TYPE}/share/cmake/EbsdLib\" CACHE PATH \"\")\n") else() - FILE(APPEND ${EMsoft_SDK_FILE} "set(EbsdLib_INSTALL \"\${EMsoft_SDK_ROOT}/${extProjectName}-${EbsdLib_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(EbsdLib_DIR \"\${EMsoft_SDK_ROOT}/${extProjectName}-${EbsdLib_VERSION}-\${BUILD_TYPE}/share/cmake/EbsdLib\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(EbsdLib_INSTALL \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${EbsdLib_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(EbsdLib_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${EbsdLib_VERSION}-\${BUILD_TYPE}/share/cmake/EbsdLib\" CACHE PATH \"\")\n") endif() -FILE(APPEND ${EMsoft_SDK_FILE} "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \${EbsdLib_DIR})\n") -FILE(APPEND ${EMsoft_SDK_FILE} "Check3rdPartyDir(DIR \${EbsdLib_DIR})\n") \ No newline at end of file +FILE(APPEND ${EMsoftOO_SDK_FILE} "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \${EbsdLib_DIR})\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "Check3rdPartyDir(DIR \${EbsdLib_DIR})\n") diff --git a/projects/Eigen.cmake b/projects/Eigen.cmake index d0cdf54..1c08448 100644 --- a/projects/Eigen.cmake +++ b/projects/Eigen.cmake @@ -14,7 +14,7 @@ message(STATUS "Building: ${extProjectName} ${Eigen3_VERSION}: -DBUILD_EIGEN=${B #set(Eigen_URL "https://bitbucket.org/eigen/eigen/get/${Eigen_VERSION}.tar.gz") set(Eigen_URL "http://dream3d.bluequartz.net/binaries/SDK/Eigen-${Eigen_VERSION}.tar.gz") -set(SOURCE_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Source/${extProjectName}.tar.gz") +set(SOURCE_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Source/${extProjectName}.tar.gz") if(WIN32) set(Eigen_CXX_FLAGS "/DWIN32 /D_WINDOWS /W3 /GR /EHsc /MP") @@ -32,21 +32,21 @@ get_filename_component(_self_dir ${CMAKE_CURRENT_LIST_FILE} PATH) configure_file( "${_self_dir}/patches/Eigen_DartConfiguration.tcl.in" - "${EMsoft_SDK}/superbuild/${extProjectName}/Build/${CMAKE_BUILD_TYPE}/DartConfiguration.tcl" + "${EMsoftOO_SDK}/superbuild/${extProjectName}/Build/${CMAKE_BUILD_TYPE}/DartConfiguration.tcl" @ONLY ) -set_property(DIRECTORY PROPERTY EP_BASE ${EMsoft_SDK}/superbuild) +set_property(DIRECTORY PROPERTY EP_BASE ${EMsoftOO_SDK}/superbuild) ExternalProject_Add(${extProjectName} DOWNLOAD_NAME ${extProjectName}-${Eigen_VERSION}.tar.gz URL ${Eigen_URL} - 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} + 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 "${SOURCE_DIR}" - BINARY_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Build/${CMAKE_BUILD_TYPE}" - INSTALL_DIR "${EMsoft_SDK}/${extProjectName}-${Eigen_VERSION}" + BINARY_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Build/${CMAKE_BUILD_TYPE}" + INSTALL_DIR "${EMsoftOO_SDK}/${extProjectName}-${Eigen_VERSION}" CMAKE_ARGS -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS} @@ -73,13 +73,13 @@ 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} "# Eigen Library Location\n") -FILE(APPEND ${EMsoft_SDK_FILE} "set(Eigen3_DIR \"\${EMsoft_SDK_ROOT}/Eigen-${Eigen_VERSION}/share/eigen3/cmake\" CACHE PATH \"\")\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "#--------------------------------------------------------------------------------------------------\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "# Eigen Library Location\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "set(Eigen3_DIR \"\${EMsoftOO_SDK_ROOT}/Eigen-${Eigen_VERSION}/share/eigen3/cmake\" CACHE PATH \"\")\n") # Set this variable into the Cache since we are going to need it for other projects later. -set(Eigen3_DIR ${EMsoft_SDK}/Eigen-${Eigen_VERSION}/share/eigen3/cmake CACHE PATH "" FORCE) +set(Eigen3_DIR ${EMsoftOO_SDK}/Eigen-${Eigen_VERSION}/share/eigen3/cmake CACHE PATH "" FORCE) diff --git a/projects/FFTW.cmake b/projects/FFTW.cmake index 1f56111..1a40bdc 100644 --- a/projects/FFTW.cmake +++ b/projects/FFTW.cmake @@ -3,17 +3,17 @@ set(extProjectName "fftw") message(STATUS "External Project: ${extProjectName}" ) set(FFTW_VERSION "3.3.8") -set(FFTW_PREFIX "${EMsoft_SDK}/superbuild/${extProjectName}") +set(FFTW_PREFIX "${EMsoftOO_SDK}/superbuild/${extProjectName}") set(FFTW_FOLDER_NAME "fftw-${FFTW_VERSION}-pl2.tar.gz") -set(FFTW_DOWNLOAD_DIR "${EMsoft_SDK}/superbuild/${extProjectName}") -set(FFTW_BINARY_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Build") -set(FFTW_SOURCE_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Source") -set(FFTW_STAMP_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Stamp") -set(FFTW_TEMP_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Tmp") -set(FFTW_INSTALL_DIR "${EMsoft_SDK}/fftw-${FFTW_VERSION}") +set(FFTW_DOWNLOAD_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}") +set(FFTW_BINARY_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Build") +set(FFTW_SOURCE_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Source") +set(FFTW_STAMP_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Stamp") +set(FFTW_TEMP_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Tmp") +set(FFTW_INSTALL_DIR "${EMsoftOO_SDK}/fftw-${FFTW_VERSION}") set(FFTW_DOWNLOAD_FILE ${FFTW_FOLDER_NAME}.tar.gz) if(WIN32) - set(FFTW_INSTALL_DIR "${EMsoft_SDK}/fftw-${FFTW_VERSION}-dll64") + set(FFTW_INSTALL_DIR "${EMsoftOO_SDK}/fftw-${FFTW_VERSION}-dll64") set(FFTW_FOLDER_NAME "fftw-${FFTW_VERSION}-dll64") endif() @@ -44,17 +44,17 @@ if(APPLE) DOWNLOAD_NAME ${FFTW_DOWNLOAD_FILE} URL ${FFTW_URL} - TMP_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/tmp" - STAMP_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Stamp" - DOWNLOAD_DIR ${EMsoft_SDK}/superbuild/${extProjectName}/Download - SOURCE_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Source" - #BINARY_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Build" + TMP_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/tmp" + STAMP_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Stamp" + DOWNLOAD_DIR ${EMsoftOO_SDK}/superbuild/${extProjectName}/Download + SOURCE_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Source" + #BINARY_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Build" INSTALL_DIR "${FFTW_INSTALL_DIR}" #DOWNLOAD_COMMAND "" UPDATE_COMMAND "" PATCH_COMMAND "" - CONFIGURE_COMMAND ${EMsoft_SDK}/superbuild/${extProjectName}/Source/configure --prefix=${FFTW_INSTALL_DIR} --enable-shared + CONFIGURE_COMMAND ${EMsoftOO_SDK}/superbuild/${extProjectName}/Source/configure --prefix=${FFTW_INSTALL_DIR} --enable-shared BUILD_COMMAND make -j${CoreCount} INSTALL_COMMAND make install TEST_COMMAND "" @@ -90,18 +90,18 @@ elseif(WIN32) configure_file( "${_self_dir}/fftw/Build_fftw.bat.in" - "${EMsoft_SDK}/superbuild/${extProjectName}/Build/Build_FFTW.bat" + "${EMsoftOO_SDK}/superbuild/${extProjectName}/Build/Build_FFTW.bat" @ONLY ) - set_property(DIRECTORY PROPERTY EP_BASE ${EMsoft_SDK}/superbuild) + set_property(DIRECTORY PROPERTY EP_BASE ${EMsoftOO_SDK}/superbuild) ExternalProject_Add(${extProjectName} DOWNLOAD_NAME ${FFTW_DOWNLOAD_FILE} URL ${FFTW_URL} - TMP_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/tmp" - STAMP_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Stamp" - DOWNLOAD_DIR ${EMsoft_SDK}/superbuild/${extProjectName} + TMP_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/tmp" + STAMP_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Stamp" + DOWNLOAD_DIR ${EMsoftOO_SDK}/superbuild/${extProjectName} SOURCE_DIR "${FFTW_INSTALL_DIR}" BINARY_DIR "${FFTW_INSTALL_DIR}" INSTALL_DIR "${FFTW_INSTALL_DIR}" @@ -109,7 +109,7 @@ elseif(WIN32) CONFIGURE_COMMAND "" PATCH_COMMAND "" BUILD_COMMAND "" - INSTALL_COMMAND "${EMsoft_SDK}/superbuild/${extProjectName}/Build/Build_FFTW.bat" + INSTALL_COMMAND "${EMsoftOO_SDK}/superbuild/${extProjectName}/Build/Build_FFTW.bat" LOG_DOWNLOAD 1 LOG_UPDATE 1 @@ -125,11 +125,11 @@ else() DOWNLOAD_NAME ${FFTW_DOWNLOAD_FILE} URL ${FFTW_URL} - TMP_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/tmp" - STAMP_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Stamp" - DOWNLOAD_DIR ${EMsoft_SDK}/superbuild/${extProjectName}/Download - SOURCE_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Source" - BINARY_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Build" + TMP_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/tmp" + STAMP_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Stamp" + DOWNLOAD_DIR ${EMsoftOO_SDK}/superbuild/${extProjectName}/Download + SOURCE_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Source" + BINARY_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Build" INSTALL_DIR "${FFTW_INSTALL_DIR}" CMAKE_ARGS @@ -149,20 +149,20 @@ else() endif() -FILE(APPEND ${EMsoft_SDK_FILE} "\n") -FILE(APPEND ${EMsoft_SDK_FILE} "#--------------------------------------------------------------------------------------------------\n") -FILE(APPEND ${EMsoft_SDK_FILE} "# FFTW ${FFTW_VERSION} Location\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "#--------------------------------------------------------------------------------------------------\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "# FFTW ${FFTW_VERSION} Location\n") if(APPLE) - FILE(APPEND ${EMsoft_SDK_FILE} "set(FFTW3_INSTALL \"\${EMsoft_SDK_ROOT}/fftw-${FFTW_VERSION}\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(FFTW3_VERSION \"${FFTW_VERSION}\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(FFTW3_INSTALL \"\${EMsoftOO_SDK_ROOT}/fftw-${FFTW_VERSION}\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(FFTW3_VERSION \"${FFTW_VERSION}\")\n") elseif(WIN32) - FILE(APPEND ${EMsoft_SDK_FILE} "set(FFTW3_INSTALL \"\${EMsoft_SDK_ROOT}/fftw-${FFTW_VERSION}-dll64/fftw-${FFTW_VERSION}-dll64\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(FFTW3_VERSION \"${FFTW_VERSION}\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(FFTW3_INCLUDE_DIR \"\${EMsoft_SDK_ROOT}/fftw-${FFTW_VERSION}-dll64\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(FFTW3_LIBRARY \"\${EMsoft_SDK_ROOT}/fftw-${FFTW_VERSION}-dll64/libfftw3-3.lib\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(FFTW3_IS_SHARED TRUE)\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(FFTW3_INSTALL \"\${EMsoftOO_SDK_ROOT}/fftw-${FFTW_VERSION}-dll64/fftw-${FFTW_VERSION}-dll64\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(FFTW3_VERSION \"${FFTW_VERSION}\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(FFTW3_INCLUDE_DIR \"\${EMsoftOO_SDK_ROOT}/fftw-${FFTW_VERSION}-dll64\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(FFTW3_LIBRARY \"\${EMsoftOO_SDK_ROOT}/fftw-${FFTW_VERSION}-dll64/libfftw3-3.lib\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(FFTW3_IS_SHARED TRUE)\n") else() - FILE(APPEND ${EMsoft_SDK_FILE} "set(FFTW3_DIR \"\${EMsoft_SDK_ROOT}/fftw-${FFTW_VERSION}/lib/cmake/fftw3\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(FFTW3_INSTALL \"\${EMsoft_SDK_ROOT}/fftw-${FFTW_VERSION}\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(FFTW3_VERSION \"${FFTW_VERSION}\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(FFTW3_DIR \"\${EMsoftOO_SDK_ROOT}/fftw-${FFTW_VERSION}/lib/cmake/fftw3\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(FFTW3_INSTALL \"\${EMsoftOO_SDK_ROOT}/fftw-${FFTW_VERSION}\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(FFTW3_VERSION \"${FFTW_VERSION}\")\n") endif() diff --git a/projects/HDF5.cmake b/projects/HDF5.cmake index 7152c18..73d90da 100644 --- a/projects/HDF5.cmake +++ b/projects/HDF5.cmake @@ -8,24 +8,25 @@ endif() set(extProjectName "hdf5") if(WIN32) - set(HDF5_VERSION "1.10.5") - set(HDF5_GIT_TAG "hdf5-1_10_5") + set(HDF5_VERSION "1.12.2") + set(HDF5_GIT_TAG "hdf5-1_12_2") else() - set(HDF5_VERSION "1.10.7") - set(HDF5_GIT_TAG "hdf5-1_10_7") + set(HDF5_VERSION "1.12.2") + set(HDF5_GIT_TAG "hdf5-1_12_2") endif() message(STATUS "Building: ${extProjectName} ${HDF5_VERSION}: -DBUILD_HDF5=${BUILD_HDF5}" ) set(HDF5_BUILD_SHARED_LIBS ON) -set(HDF5_INSTALL "${EMsoft_SDK}/${extProjectName}-${HDF5_VERSION}-${CMAKE_BUILD_TYPE}") +set(HDF5_INSTALL "${EMsoftOO_SDK}/${extProjectName}-${HDF5_VERSION}-${CMAKE_BUILD_TYPE}") +set(PL_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}-${HDF5_VERSION}/Source/${extProjectName}/config/cmake") if( CMAKE_BUILD_TYPE MATCHES Debug ) set(HDF5_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(NOT WIN32) set(HDF5_BUILD_SHARED_LIBS OFF) @@ -41,21 +42,21 @@ endif() ExternalProject_Add(${extProjectName} # DOWNLOAD_NAME ${extProjectName}-${HDF5_VERSION}.tar.gz # URL ${HDF5_URL} - # 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 "${HDF5_INSTALL}" GIT_REPOSITORY "https://github.com/HDFGroup/hdf5/" GIT_PROGRESS 1 GIT_TAG ${HDF5_GIT_TAG} - TMP_DIR "${EMsoft_SDK}/superbuild/${extProjectName}-${HDF5_VERSION}/tmp/${CMAKE_BUILD_TYPE}" - STAMP_DIR "${EMsoft_SDK}/superbuild/${extProjectName}-${HDF5_VERSION}/Stamp/${CMAKE_BUILD_TYPE}" - DOWNLOAD_DIR "${EMsoft_SDK}/superbuild/${extProjectName}-${HDF5_VERSION}" - SOURCE_DIR "${EMsoft_SDK}/superbuild/${extProjectName}-${HDF5_VERSION}/Source/${extProjectName}" - BINARY_DIR "${EMsoft_SDK}/superbuild/${extProjectName}-${HDF5_VERSION}/Build/${CMAKE_BUILD_TYPE}" + TMP_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}-${HDF5_VERSION}/tmp/${CMAKE_BUILD_TYPE}" + STAMP_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}-${HDF5_VERSION}/Stamp/${CMAKE_BUILD_TYPE}" + DOWNLOAD_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}-${HDF5_VERSION}" + SOURCE_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}-${HDF5_VERSION}/Source/${extProjectName}" + BINARY_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}-${HDF5_VERSION}/Build/${CMAKE_BUILD_TYPE}" INSTALL_DIR "${HDF5_INSTALL}" CMAKE_ARGS @@ -75,6 +76,8 @@ ExternalProject_Add(${extProjectName} -DHDF5_BUILD_HL_LIB=ON -DHDF_PACKAGE_NAMESPACE=hdf5:: -DHDF5_BUILD_FORTRAN=ON + -DHDF5_ENABLE_PLUGIN_SUPPORT=ON + -DPLUGIN_DIR=${PL_DIR} -DHDF5_BUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF @@ -86,21 +89,26 @@ ExternalProject_Add(${extProjectName} LOG_INSTALL 1 ) +# HDF5-1.12.2 expets there to be a file called PLUGINConfig.cmake or plugin-config.cmake in the +# PL_DIR directory. What is actually there is a file called HDF5PluginMacros.cmake. So, here +# we create a symbolic link from plugin-config.cmake to HDF5PluginMacros.cmake... manual experimenting +# showed that this results in a build that includes the plugin libraries +execute_process (COMMAND bash -c "ln -s ${PL_DIR}/HDF5PluginMacros.cmake ${PL_DIR}/plugin-config.cmake") -#-- 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 DREAM3D for building -FILE(APPEND ${EMsoft_SDK_FILE} "\n") -FILE(APPEND ${EMsoft_SDK_FILE} "#--------------------------------------------------------------------------------------------------\n") -FILE(APPEND ${EMsoft_SDK_FILE} "# HDF5 Library Location\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "#--------------------------------------------------------------------------------------------------\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "# HDF5 Library Location\n") if(APPLE) - FILE(APPEND ${EMsoft_SDK_FILE} "set(HDF5_INSTALL \"\${EMsoft_SDK_ROOT}/${extProjectName}-${HDF5_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(HDF5_DIR \"\${EMsoft_SDK_ROOT}/${extProjectName}-${HDF5_VERSION}-\${BUILD_TYPE}/share/cmake/hdf5\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(HDF5_INSTALL \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${HDF5_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(HDF5_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${HDF5_VERSION}-\${BUILD_TYPE}/share/cmake/hdf5\" CACHE PATH \"\")\n") elseif(WIN32) - FILE(APPEND ${EMsoft_SDK_FILE} "set(HDF5_INSTALL \"\${EMsoft_SDK_ROOT}/${extProjectName}-${HDF5_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(HDF5_DIR \"\${EMsoft_SDK_ROOT}/${extProjectName}-${HDF5_VERSION}-\${BUILD_TYPE}/cmake/hdf5\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(HDF5_INSTALL \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${HDF5_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(HDF5_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${HDF5_VERSION}-\${BUILD_TYPE}/cmake/hdf5\" CACHE PATH \"\")\n") else() - FILE(APPEND ${EMsoft_SDK_FILE} "set(HDF5_INSTALL \"\${EMsoft_SDK_ROOT}/${extProjectName}-${HDF5_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(HDF5_DIR \"\${EMsoft_SDK_ROOT}/${extProjectName}-${HDF5_VERSION}-\${BUILD_TYPE}/share/cmake/hdf5\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(HDF5_INSTALL \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${HDF5_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(HDF5_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${HDF5_VERSION}-\${BUILD_TYPE}/share/cmake/hdf5\" CACHE PATH \"\")\n") endif() -FILE(APPEND ${EMsoft_SDK_FILE} "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \${HDF5_DIR})\n") -FILE(APPEND ${EMsoft_SDK_FILE} "set(HDF5_VERSION \"${HDF5_VERSION}\" CACHE STRING \"\")\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \${HDF5_DIR})\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "set(HDF5_VERSION \"${HDF5_VERSION}\" CACHE STRING \"\")\n") diff --git a/projects/JsonFortran.cmake b/projects/JsonFortran.cmake index 9124ba2..9a73ede 100644 --- a/projects/JsonFortran.cmake +++ b/projects/JsonFortran.cmake @@ -30,18 +30,18 @@ message(STATUS "Building: ${extProjectName} ${JSONFORTRAN_VERSION}: -DBUILD_JSON include(GNUInstallDirs) if(MSVC_IDE) - set(JSONFORTRAN_INSTALL "${EMsoft_SDK}/${extProjectName}-${JSONFORTRAN_VERSION}") + set(JSONFORTRAN_INSTALL "${EMsoftOO_SDK}/${extProjectName}-${JSONFORTRAN_VERSION}") elseif(WIN32) - set(JSONFORTRAN_INSTALL "${EMsoft_SDK}/${extProjectName}-${JSONFORTRAN_VERSION}-${CMAKE_BUILD_TYPE}") + set(JSONFORTRAN_INSTALL "${EMsoftOO_SDK}/${extProjectName}-${JSONFORTRAN_VERSION}-${CMAKE_BUILD_TYPE}") else() - set(JSONFORTRAN_INSTALL "${EMsoft_SDK}/${extProjectName}-${JSONFORTRAN_VERSION}-${CMAKE_BUILD_TYPE}") + set(JSONFORTRAN_INSTALL "${EMsoftOO_SDK}/${extProjectName}-${JSONFORTRAN_VERSION}-${CMAKE_BUILD_TYPE}") endif() if( CMAKE_BUILD_TYPE MATCHES Debug ) set(JSONFORTRAN_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) @@ -68,11 +68,11 @@ ExternalProject_Add(${extProjectName} #URL ${JSONFORTRAN_URL} GIT_REPOSITORY "${GIT_REPOSITORY_URL}" GIT_TAG "${JSONFORTRAN_VERSION}" - 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 "${JSONFORTRAN_INSTALL}" CMAKE_ARGS @@ -99,29 +99,29 @@ if (${CMAKE_Fortran_COMPILER} MATCHES "ifort.*") set(FC_NAME "intel") 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} "# JSONFORTRAN Library Location\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "#--------------------------------------------------------------------------------------------------\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "# JSONFORTRAN Library Location\n") if(APPLE) - FILE(APPEND ${EMsoft_SDK_FILE} "set(JSONFORTRAN_INSTALL \"\${EMsoft_SDK_ROOT}/${extProjectName}-${JSONFORTRAN_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(JSONFORTRAN_DIR \"\${EMsoft_SDK_ROOT}/${extProjectName}-${JSONFORTRAN_VERSION}-\${BUILD_TYPE}/lib/cmake/${extProjectName}-${FC_NAME}-${JSONFORTRAN_VERSION}\" CACHE PATH \"\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(${extProjectName}-${FC_NAME}_DIR \"\${JSONFORTRAN_DIR}\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(JSONFORTRAN_INSTALL \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${JSONFORTRAN_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(JSONFORTRAN_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${JSONFORTRAN_VERSION}-\${BUILD_TYPE}/lib/cmake/${extProjectName}-${FC_NAME}-${JSONFORTRAN_VERSION}\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(${extProjectName}-${FC_NAME}_DIR \"\${JSONFORTRAN_DIR}\" CACHE PATH \"\")\n") elseif(MSVC_IDE) - FILE(APPEND ${EMsoft_SDK_FILE} "set(JSONFORTRAN_INSTALL \"\${EMsoft_SDK_ROOT}/${extProjectName}-${JSONFORTRAN_VERSION}\" CACHE PATH \"\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(JSONFORTRAN_DIR \"\${JSONFORTRAN_INSTALL}/lib/cmake/${extProjectName}-${FC_NAME}-${JSONFORTRAN_VERSION}\" CACHE PATH \"\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(${extProjectName}-${FC_NAME}_DIR \"\${JSONFORTRAN_DIR}\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(JSONFORTRAN_INSTALL \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${JSONFORTRAN_VERSION}\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(JSONFORTRAN_DIR \"\${JSONFORTRAN_INSTALL}/lib/cmake/${extProjectName}-${FC_NAME}-${JSONFORTRAN_VERSION}\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(${extProjectName}-${FC_NAME}_DIR \"\${JSONFORTRAN_DIR}\" CACHE PATH \"\")\n") elseif(WIN32) - FILE(APPEND ${EMsoft_SDK_FILE} "set(JSONFORTRAN_INSTALL \"\${EMsoft_SDK_ROOT}/${extProjectName}-${JSONFORTRAN_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(JSONFORTRAN_DIR \"\${JSONFORTRAN_INSTALL}/lib/cmake/${extProjectName}-${FC_NAME}-${JSONFORTRAN_VERSION}\" CACHE PATH \"\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(${extProjectName}-${FC_NAME}_DIR \"\${JSONFORTRAN_DIR}\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(JSONFORTRAN_INSTALL \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${JSONFORTRAN_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(JSONFORTRAN_DIR \"\${JSONFORTRAN_INSTALL}/lib/cmake/${extProjectName}-${FC_NAME}-${JSONFORTRAN_VERSION}\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(${extProjectName}-${FC_NAME}_DIR \"\${JSONFORTRAN_DIR}\" CACHE PATH \"\")\n") else() - FILE(APPEND ${EMsoft_SDK_FILE} "set(JSONFORTRAN_INSTALL \"\${EMsoft_SDK_ROOT}/${extProjectName}-${JSONFORTRAN_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(JSONFORTRAN_DIR \"\${EMsoft_SDK_ROOT}/${extProjectName}-${JSONFORTRAN_VERSION}-\${BUILD_TYPE}/${CMAKE_INSTALL_LIBDIR}/cmake/${extProjectName}-${FC_NAME}-${JSONFORTRAN_VERSION}\" CACHE PATH \"\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(${extProjectName}-${FC_NAME}_DIR \"\${JSONFORTRAN_DIR}\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(JSONFORTRAN_INSTALL \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${JSONFORTRAN_VERSION}-\${BUILD_TYPE}\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(JSONFORTRAN_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${JSONFORTRAN_VERSION}-\${BUILD_TYPE}/${CMAKE_INSTALL_LIBDIR}/cmake/${extProjectName}-${FC_NAME}-${JSONFORTRAN_VERSION}\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(${extProjectName}-${FC_NAME}_DIR \"\${JSONFORTRAN_DIR}\" CACHE PATH \"\")\n") endif() -FILE(APPEND ${EMsoft_SDK_FILE} "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \${JSONFORTRAN_DIR})\n") -FILE(APPEND ${EMsoft_SDK_FILE} "Check3rdPartyDir(DIR \${JSONFORTRAN_DIR})\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \${JSONFORTRAN_DIR})\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "Check3rdPartyDir(DIR \${JSONFORTRAN_DIR})\n") diff --git a/projects/MKL.cmake b/projects/MKL.cmake index 8fae1f3..ec4db54 100644 --- a/projects/MKL.cmake +++ b/projects/MKL.cmake @@ -17,12 +17,12 @@ else() set(mkl_url "http://dream3d.bluequartz.net/binaries/SDK/Sources/intel/l_mkl_${mkl_version_full}.tgz") endif() -set(mkl_INSTALL "${EMsoft_SDK}/${extProjectName}${mkl_version_full}") -set(mkl_BINARY_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Build") +set(mkl_INSTALL "${EMsoftOO_SDK}/${extProjectName}${mkl_version_full}") +set(mkl_BINARY_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Build") get_filename_component(_self_dir ${CMAKE_CURRENT_LIST_FILE} PATH) -set(MKL_INSTALL_LOCATION "${EMsoft_SDK}/intel") +set(MKL_INSTALL_LOCATION "${EMsoftOO_SDK}/intel") if(APPLE) set(mkl_Headless_FILE "apple/mkl_HeadlessInstall_OSX.cfg.in") @@ -32,7 +32,7 @@ else() set(mkl_Headless_FILE "unix/mkl_HeadlessInstall.cfg.in") endif() -set(MKL_CONFIG_FILE "${EMsoft_SDK}/superbuild/${extProjectName}/Download/mkl_config.cfg") +set(MKL_CONFIG_FILE "${EMsoftOO_SDK}/superbuild/${extProjectName}/Download/mkl_config.cfg") configure_file( "${_self_dir}/${mkl_Headless_FILE}" "${MKL_CONFIG_FILE}" @@ -73,11 +73,11 @@ if(APPLE) set(mkl_OSX_BASE_NAME m_mkl_${mkl_version_full}) - set(mkl_OSX_DMG_ABS_PATH "${EMsoft_SDK}/superbuild/${extProjectName}/${mkl_OSX_BASE_NAME}.dmg") + set(mkl_OSX_DMG_ABS_PATH "${EMsoftOO_SDK}/superbuild/${extProjectName}/${mkl_OSX_BASE_NAME}.dmg") set(mkl_DMG ${mkl_OSX_DMG_ABS_PATH}) - set(mkl_INSTALL_SCRIPT "${EMsoft_SDK}/superbuild/${extProjectName}/Download/mkl_osx_install.sh") - set(MKL_INSTALL_LOG_FILE "${EMsoft_SDK}/superbuild/${extProjectName}/Download/mkl-offline-out.log") - set(MKL_INSTALL_ERR_FILE "${EMsoft_SDK}/superbuild/${extProjectName}/Download/mkl-offline-err.log") + set(mkl_INSTALL_SCRIPT "${EMsoftOO_SDK}/superbuild/${extProjectName}/Download/mkl_osx_install.sh") + set(MKL_INSTALL_LOG_FILE "${EMsoftOO_SDK}/superbuild/${extProjectName}/Download/mkl-offline-out.log") + set(MKL_INSTALL_ERR_FILE "${EMsoftOO_SDK}/superbuild/${extProjectName}/Download/mkl-offline-err.log") configure_file( "${_self_dir}/apple/mkl_osx_install.sh.in" @@ -139,21 +139,21 @@ else() 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 DREAM3D for building -FILE(APPEND ${EMsoft_SDK_FILE} "\n") -FILE(APPEND ${EMsoft_SDK_FILE} "#--------------------------------------------------------------------------------------------------\n") -FILE(APPEND ${EMsoft_SDK_FILE} "# MKL ${mkl_version_full} Library\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "#--------------------------------------------------------------------------------------------------\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "# MKL ${mkl_version_full} Library\n") if(APPLE) - FILE(APPEND ${EMsoft_SDK_FILE} "set(MKL_DIR \"${MKL_INSTALL_LOCATION}/mkl\" CACHE PATH \"\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(INTEL_DIR \"${MKL_INSTALL_LOCATION}\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(MKL_DIR \"${MKL_INSTALL_LOCATION}/mkl\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(INTEL_DIR \"${MKL_INSTALL_LOCATION}\" CACHE PATH \"\")\n") elseif(WIN32) - FILE(APPEND ${EMsoft_SDK_FILE} "set(MKL_DIR \"${MKL_DIR}\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(MKL_DIR \"${MKL_DIR}\" CACHE PATH \"\")\n") else() - FILE(APPEND ${EMsoft_SDK_FILE} "set(MKL_DIR \"\${EMsoft_SDK_ROOT}/${extProjectName}/${mkl_version_short}/gcc_64/lib/cmake/MKL\" CACHE PATH \"\")\n") - set(MKL_DIR "${EMsoft_SDK}/${extProjectName}/${mkl_version_short}/gcc_64/lib/cmake/MKL" CACHE PATH "" FORCE) + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(MKL_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}/${mkl_version_short}/gcc_64/lib/cmake/MKL\" CACHE PATH \"\")\n") + set(MKL_DIR "${EMsoftOO_SDK}/${extProjectName}/${mkl_version_short}/gcc_64/lib/cmake/MKL" CACHE PATH "" FORCE) endif() -#FILE(APPEND ${EMsoft_SDK_FILE} "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \${MKL_DIR})\n") +#FILE(APPEND ${EMsoftOO_SDK_FILE} "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \${MKL_DIR})\n") diff --git a/projects/Qt5.cmake b/projects/Qt5.cmake index c607389..f12f9d3 100644 --- a/projects/Qt5.cmake +++ b/projects/Qt5.cmake @@ -96,11 +96,11 @@ if(NOT INSTALL_QT5 AND NOT "${Qt5_QMAKE_EXECUTABLE}" STREQUAL "") set(extProjectName "Qt${qt5_version_full}") message(STATUS "Using Installed ${extProjectName}: -DQt5_QMAKE_EXECUTABLE=${Qt5_QMAKE_EXECUTABLE}" ) - FILE(APPEND ${EMsoft_SDK_FILE} "\n") - FILE(APPEND ${EMsoft_SDK_FILE} "#--------------------------------------------------------------------------------------------------\n") - FILE(APPEND ${EMsoft_SDK_FILE} "# Qt5 ${qt5_version_full} Library\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(Qt5_DIR \"${QT_INSTALL_LIBS}/cmake/Qt5\" CACHE PATH \"\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \${Qt5_DIR})\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "#--------------------------------------------------------------------------------------------------\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "# Qt5 ${qt5_version_full} Library\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(Qt5_DIR \"${QT_INSTALL_LIBS}/cmake/Qt5\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \${Qt5_DIR})\n") return() endif() @@ -108,12 +108,12 @@ if("${INSTALL_QT5}") message(STATUS "Building: ${extProjectName} ${qt5_version_full}: -DINSTALL_QT5=${INSTALL_QT5}" ) endif() -set(qt5_INSTALL "${EMsoft_SDK}/${extProjectName}${qt5_version_full}") -set(qt5_BINARY_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Build") +set(qt5_INSTALL "${EMsoftOO_SDK}/${extProjectName}${qt5_version_full}") +set(qt5_BINARY_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Build") get_filename_component(_self_dir ${CMAKE_CURRENT_LIST_FILE} PATH) -set(QT_INSTALL_LOCATION "${EMsoft_SDK}/${extProjectName}") +set(QT_INSTALL_LOCATION "${EMsoftOO_SDK}/${extProjectName}") if(APPLE) set(qt5_Headless_FILE "apple/Qt_HeadlessInstall_OSX.js") @@ -134,7 +134,7 @@ if(MSVC_VERSION GREATER 1900) set(QT_MSVC_VERSION_NAME "msvc2017_64") endif() -set(JSFILE "${EMsoft_SDK}/superbuild/${extProjectName}/Download/Qt_HeadlessInstall.js") +set(JSFILE "${EMsoftOO_SDK}/superbuild/${extProjectName}/Download/Qt_HeadlessInstall.js") configure_file( "${_self_dir}/${qt5_Headless_FILE}" "${JSFILE}" @@ -146,7 +146,7 @@ if(APPLE) set(Qt5_OSX_BASE_NAME qt-opensource-mac-x64-${qt5_version_full}) - set(Qt5_OSX_DMG_ABS_PATH "${EMsoft_SDK}/superbuild/${extProjectName}/${Qt5_OSX_BASE_NAME}.dmg") + set(Qt5_OSX_DMG_ABS_PATH "${EMsoftOO_SDK}/superbuild/${extProjectName}/${Qt5_OSX_BASE_NAME}.dmg") set(Qt5_DMG ${Qt5_OSX_DMG_ABS_PATH}) configure_file( @@ -170,8 +170,8 @@ if(APPLE) message(STATUS " This may take some time for the installer to start.") message(STATUS " Please wait for the installer to finish.") execute_process(COMMAND "${CMAKE_BINARY_DIR}/Qt5_osx_install.sh" - OUTPUT_FILE "${EMsoft_SDK}/superbuild/${extProjectName}/Download/Qt5-offline-out.log" - ERROR_FILE "${EMsoft_SDK}/superbuild/${extProjectName}/Download/Qt5-offline-err.log" + OUTPUT_FILE "${EMsoftOO_SDK}/superbuild/${extProjectName}/Download/Qt5-offline-out.log" + ERROR_FILE "${EMsoftOO_SDK}/superbuild/${extProjectName}/Download/Qt5-offline-err.log" ERROR_VARIABLE mount_error WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) @@ -183,25 +183,25 @@ elseif(WIN32) set(qt5_online_installer "qt-opensource-windows-x86-${qt5_version_full}.exe") set(qt5_url "http://qt.mirror.constant.com/archive/qt/${qt5_version_major}/${qt5_version_short}/qt-opensource-windows-x86-${qt5_version_full}.exe") - if(NOT EXISTS "${EMsoft_SDK}/superbuild/${extProjectName}/Download/${qt5_online_installer}") + if(NOT EXISTS "${EMsoftOO_SDK}/superbuild/${extProjectName}/Download/${qt5_online_installer}") message(STATUS "===============================================================") message(STATUS " Downloading ${extProjectName}") message(STATUS " Large Download!! This can take a bit... Please be patient") - file(DOWNLOAD ${qt5_url} "${EMsoft_SDK}/superbuild/${extProjectName}/Download/${qt5_online_installer}" SHOW_PROGRESS) + file(DOWNLOAD ${qt5_url} "${EMsoftOO_SDK}/superbuild/${extProjectName}/Download/${qt5_online_installer}" SHOW_PROGRESS) endif() - set(QT5_ONLINE_INSTALLER "${EMsoft_SDK}/superbuild/${extProjectName}/Download/${qt5_online_installer}") + set(QT5_ONLINE_INSTALLER "${EMsoftOO_SDK}/superbuild/${extProjectName}/Download/${qt5_online_installer}") configure_file( "${_self_dir}/win32/Qt_HeadlessInstall.bat" - "${EMsoft_SDK}/superbuild/${extProjectName}/Download/Qt_HeadlessInstall.bat" + "${EMsoftOO_SDK}/superbuild/${extProjectName}/Download/Qt_HeadlessInstall.bat" @ONLY ) - if(NOT EXISTS "${EMsoft_SDK}/${extProjectName}") + if(NOT EXISTS "${EMsoftOO_SDK}/${extProjectName}") message(STATUS "Executing the Qt5 Installer... ") - execute_process(COMMAND "${EMsoft_SDK}/superbuild/${extProjectName}/Download/Qt_HeadlessInstall.bat" - OUTPUT_FILE "${EMsoft_SDK}/superbuild/${extProjectName}/Download/qt-unified-out.log" - ERROR_FILE "${EMsoft_SDK}/superbuild/${extProjectName}/Download/qt-unified-err.log" + execute_process(COMMAND "${EMsoftOO_SDK}/superbuild/${extProjectName}/Download/Qt_HeadlessInstall.bat" + OUTPUT_FILE "${EMsoftOO_SDK}/superbuild/${extProjectName}/Download/qt-unified-out.log" + ERROR_FILE "${EMsoftOO_SDK}/superbuild/${extProjectName}/Download/qt-unified-err.log" ERROR_VARIABLE installer_error WORKING_DIRECTORY ${qt5_BINARY_DIR} ) endif() @@ -210,24 +210,24 @@ else() set(qt5_online_installer "qt-opensource-linux-x64-${qt5_version_full}.run") set(qt5_url "http://qt.mirror.constant.com/archive/qt/${qt5_version_major}/${qt5_version_short}/${qt5_online_installer}") - if(NOT EXISTS "${EMsoft_SDK}/superbuild/${extProjectName}/Download/${qt5_online_installer}") + if(NOT EXISTS "${EMsoftOO_SDK}/superbuild/${extProjectName}/Download/${qt5_online_installer}") message(STATUS "===============================================================") message(STATUS " Downloading ${extProjectName}") message(STATUS " Large Download!! This can take a bit... Please be patient") - file(DOWNLOAD ${qt5_url} "${EMsoft_SDK}/superbuild/${extProjectName}/Download/${qt5_online_installer}" SHOW_PROGRESS) + file(DOWNLOAD ${qt5_url} "${EMsoftOO_SDK}/superbuild/${extProjectName}/Download/${qt5_online_installer}" SHOW_PROGRESS) endif() - set(QT5_ONLINE_INSTALLER "${EMsoft_SDK}/superbuild/${extProjectName}/Download/${qt5_online_installer}") + set(QT5_ONLINE_INSTALLER "${EMsoftOO_SDK}/superbuild/${extProjectName}/Download/${qt5_online_installer}") configure_file( "${_self_dir}/unix/Qt5_linux_install.sh.in" - "${EMsoft_SDK}/superbuild/${extProjectName}/Download/Qt_HeadlessInstall.sh" + "${EMsoftOO_SDK}/superbuild/${extProjectName}/Download/Qt_HeadlessInstall.sh" ) - if(NOT EXISTS "${EMsoft_SDK}/${extProjectName}") + if(NOT EXISTS "${EMsoftOO_SDK}/${extProjectName}") message(STATUS "Executing the Qt5 Installer... ") - execute_process(COMMAND "${EMsoft_SDK}/superbuild/${extProjectName}/Download/Qt_HeadlessInstall.sh" - OUTPUT_FILE "${EMsoft_SDK}/superbuild/${extProjectName}/Download/qt-unified-out.log" - ERROR_FILE "${EMsoft_SDK}/superbuild/${extProjectName}/Download/qt-unified-err.log" + execute_process(COMMAND "${EMsoftOO_SDK}/superbuild/${extProjectName}/Download/Qt_HeadlessInstall.sh" + OUTPUT_FILE "${EMsoftOO_SDK}/superbuild/${extProjectName}/Download/qt-unified-out.log" + ERROR_FILE "${EMsoftOO_SDK}/superbuild/${extProjectName}/Download/qt-unified-err.log" ERROR_VARIABLE installer_error WORKING_DIRECTORY ${qt5_BINARY_DIR} ) message(STATUS "installer_error: ${installer_error}") @@ -239,12 +239,12 @@ endif() ExternalProject_Add(Qt5 - 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}/Download" - SOURCE_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Source" - BINARY_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Build" - INSTALL_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Install" + 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}/Download" + SOURCE_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Source" + BINARY_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Build" + INSTALL_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Install" DOWNLOAD_COMMAND "" UPDATE_COMMAND "" @@ -255,21 +255,21 @@ ExternalProject_Add(Qt5 TEST_COMMAND "" ) -#-- 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 DREAM3D for building -FILE(APPEND ${EMsoft_SDK_FILE} "\n") -FILE(APPEND ${EMsoft_SDK_FILE} "#--------------------------------------------------------------------------------------------------\n") -FILE(APPEND ${EMsoft_SDK_FILE} "# Qt ${qt5_version_full} Library\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "#--------------------------------------------------------------------------------------------------\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "# Qt ${qt5_version_full} Library\n") if(APPLE) - FILE(APPEND ${EMsoft_SDK_FILE} "set(Qt5_DIR \"\${EMsoft_SDK}/${extProjectName}/${qt5_version_short}/clang_64/lib/cmake/Qt5\" CACHE PATH \"\")\n") - set(Qt5_DIR "${EMsoft_SDK}/${extProjectName}/${qt5_version_short}/clang_64/lib/cmake/Qt5" CACHE PATH "") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(Qt5_DIR \"\${EMsoftOO_SDK}/${extProjectName}/${qt5_version_short}/clang_64/lib/cmake/Qt5\" CACHE PATH \"\")\n") + set(Qt5_DIR "${EMsoftOO_SDK}/${extProjectName}/${qt5_version_short}/clang_64/lib/cmake/Qt5" CACHE PATH "") elseif(WIN32) - FILE(APPEND ${EMsoft_SDK_FILE} "set(Qt5_DIR \"\${EMsoft_SDK}/${extProjectName}/${qt5_version_short}/${QT_MSVC_VERSION_NAME}/lib/cmake/Qt5\" CACHE PATH \"\")\n") - set(Qt5_DIR "${EMsoft_SDK}/${extProjectName}/${qt5_version_short}/${QT_MSVC_VERSION_NAME}/lib/cmake/Qt5" CACHE PATH "") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(Qt5_DIR \"\${EMsoftOO_SDK}/${extProjectName}/${qt5_version_short}/${QT_MSVC_VERSION_NAME}/lib/cmake/Qt5\" CACHE PATH \"\")\n") + set(Qt5_DIR "${EMsoftOO_SDK}/${extProjectName}/${qt5_version_short}/${QT_MSVC_VERSION_NAME}/lib/cmake/Qt5" CACHE PATH "") else() - FILE(APPEND ${EMsoft_SDK_FILE} "set(Qt5_DIR \"\${EMsoft_SDK}/${extProjectName}/${qt5_version_short}/gcc_64/lib/cmake/Qt5\" CACHE PATH \"\")\n") - set(Qt5_DIR "${EMsoft_SDK}/${extProjectName}/${qt5_version_short}/gcc_64/lib/cmake/Qt5" CACHE PATH "") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(Qt5_DIR \"\${EMsoftOO_SDK}/${extProjectName}/${qt5_version_short}/gcc_64/lib/cmake/Qt5\" CACHE PATH \"\")\n") + set(Qt5_DIR "${EMsoftOO_SDK}/${extProjectName}/${qt5_version_short}/gcc_64/lib/cmake/Qt5" CACHE PATH "") endif() -FILE(APPEND ${EMsoft_SDK_FILE} "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \${Qt5_DIR})\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \${Qt5_DIR})\n") diff --git a/projects/TBB.cmake b/projects/TBB.cmake index a369a89..5291197 100644 --- a/projects/TBB.cmake +++ b/projects/TBB.cmake @@ -30,9 +30,9 @@ else() endif() set(tbb_URL "${tbb_url_server}/tbb-${tbb_VERSION}-${tbb_os_name}.${tbb_os_ext}") -set(tbb_INSTALL "${EMsoft_SDK}/tbb-${tbb_VERSION}-${tbb_os_name}") +set(tbb_INSTALL "${EMsoftOO_SDK}/tbb-${tbb_VERSION}-${tbb_os_name}") -set_property(DIRECTORY PROPERTY EP_BASE ${EMsoft_SDK}/superbuild) +set_property(DIRECTORY PROPERTY EP_BASE ${EMsoftOO_SDK}/superbuild) #------------------------------------------------------------------------------ # Linux has TBB Compiled and installed @@ -40,11 +40,11 @@ if(WIN32 OR APPLE OR "${BUILD_TBB}" STREQUAL "ON" ) ExternalProject_Add(${extProjectName} # DOWNLOAD_NAME ${extProjectName}-${tbb_VERSION}.tar.gz URL ${tbb_URL} - TMP_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/tmp/${CMAKE_BUILD_TYPE}" - STAMP_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Stamp" - DOWNLOAD_DIR ${EMsoft_SDK}/superbuild/${extProjectName} + TMP_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/tmp/${CMAKE_BUILD_TYPE}" + STAMP_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Stamp" + DOWNLOAD_DIR ${EMsoftOO_SDK}/superbuild/${extProjectName} SOURCE_DIR "${tbb_INSTALL}" - BINARY_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Build/${CMAKE_BUILD_TYPE}" + BINARY_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Build/${CMAKE_BUILD_TYPE}" INSTALL_DIR "${tbb_INSTALL}" CONFIGURE_COMMAND "" BUILD_COMMAND "" @@ -58,26 +58,26 @@ if(WIN32 OR APPLE OR "${BUILD_TBB}" STREQUAL "ON" ) LOG_INSTALL 1 ) - #-- 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} "# Intel Threading Building Blocks Library\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(SIMPL_USE_MULTITHREADED_ALGOS ON CACHE BOOL \"\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(TBB_INSTALL_DIR \"\${EMsoft_SDK_ROOT}/tbb-${tbb_VERSION}-${tbb_os_name}/${extProjectName}\" CACHE PATH \"\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(TBB_DIR \"\${EMsoft_SDK_ROOT}/tbb-${tbb_VERSION}-${tbb_os_name}/${extProjectName}/cmake\" CACHE PATH \"\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(TBB_ARCH_TYPE \"intel64\" CACHE STRING \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "#--------------------------------------------------------------------------------------------------\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "# Intel Threading Building Blocks Library\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(SIMPL_USE_MULTITHREADED_ALGOS ON CACHE BOOL \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(TBB_INSTALL_DIR \"\${EMsoftOO_SDK_ROOT}/tbb-${tbb_VERSION}-${tbb_os_name}/${extProjectName}\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(TBB_DIR \"\${EMsoftOO_SDK_ROOT}/tbb-${tbb_VERSION}-${tbb_os_name}/${extProjectName}/cmake\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(TBB_ARCH_TYPE \"intel64\" CACHE STRING \"\")\n") else() message(STATUS "LINUX: Please use your package manager to install Threading Building Blocks (TBB)") #------------------------------------------------------------------------------ # Linux has an acceptable TBB installation - FILE(APPEND ${EMsoft_SDK_FILE} "\n") - FILE(APPEND ${EMsoft_SDK_FILE} "#--------------------------------------------------------------------------------------------------\n") - FILE(APPEND ${EMsoft_SDK_FILE} "# Intel Threading Building Blocks Library\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(SIMPL_USE_MULTITHREADED_ALGOS ON CACHE BOOL \"\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(TBB_INSTALL_DIR \"/usr\" CACHE PATH \"\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(TBB_DIR \"/usr\" CACHE PATH \"\")\n") - FILE(APPEND ${EMsoft_SDK_FILE} "set(TBB_ARCH_TYPE \"intel64\" CACHE STRING \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "#--------------------------------------------------------------------------------------------------\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "# Intel Threading Building Blocks Library\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(SIMPL_USE_MULTITHREADED_ALGOS ON CACHE BOOL \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(TBB_INSTALL_DIR \"/usr\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(TBB_DIR \"/usr\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(TBB_ARCH_TYPE \"intel64\" CACHE STRING \"\")\n") endif() -FILE(APPEND ${EMsoft_SDK_FILE} "set(TBB_VERSION \"${tbb_VERSION}\" CACHE STRING \"\")\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "set(TBB_VERSION \"${tbb_VERSION}\" CACHE STRING \"\")\n") diff --git a/projects/apple/OSX_EMsoft_SDK.cmake b/projects/apple/OSX_EMsoftOO_SDK.cmake similarity index 85% rename from projects/apple/OSX_EMsoft_SDK.cmake rename to projects/apple/OSX_EMsoftOO_SDK.cmake index fe8979a..04c91bf 100644 --- a/projects/apple/OSX_EMsoft_SDK.cmake +++ b/projects/apple/OSX_EMsoftOO_SDK.cmake @@ -1,8 +1,8 @@ -# This is the EMsoft_SDK File. This file contains all the paths to the dependent libraries. -if(NOT DEFINED EMsoft_FIRST_CONFIGURE) +# This is the EMsoftOO_SDK File. This file contains all the paths to the dependent libraries. +if(NOT DEFINED EMsoftOO_FIRST_CONFIGURE) message(STATUS "*******************************************************") message(STATUS "* EMsoft First Configuration Run *") - message(STATUS "* EMsoft_SDK Loading from ${CMAKE_CURRENT_LIST_DIR} *") + message(STATUS "* EMsoftOO_SDK Loading from ${CMAKE_CURRENT_LIST_DIR} *") message(STATUS "*******************************************************") set(CMAKE_CXX_FLAGS "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas -mfpmath=sse" CACHE STRING "" FORCE) set(CMAKE_CXX_STANDARD_REQUIRED ON CACHE STRING "" FORCE) @@ -15,8 +15,8 @@ endif() # Only Run this the first time when configuring EMsoft. After that the values # are cached properly and the user can add additional plugins through the normal # CMake GUI or CCMake programs. -if(NOT DEFINED EMsoft_FIRST_CONFIGURE) - set(EMsoft_FIRST_CONFIGURE "ON" CACHE STRING "Determines if EMsoft has already been configured at least once.") +if(NOT DEFINED EMsoftOO_FIRST_CONFIGURE) + set(EMsoftOO_FIRST_CONFIGURE "ON" CACHE STRING "Determines if EMsoft has already been configured at least once.") endif() #------------------------------------------------------------------------------- diff --git a/projects/ghcFilesystem.cmake b/projects/ghcFilesystem.cmake index e6ce781..08224ff 100644 --- a/projects/ghcFilesystem.cmake +++ b/projects/ghcFilesystem.cmake @@ -14,18 +14,18 @@ set(ghcFilesystem_GIT_TAG "v1.3.2") set(ghcFilesystem_VERSION "1.3.2") message(STATUS "Building: ${extProjectName} ${ghcFilesystem_VERSION}: ghcFilesystem required") -set(ghcFilesystem_INSTALL "${EMsoft_SDK}/${extProjectName}-${ghcFilesystem_VERSION}") +set(ghcFilesystem_INSTALL "${EMsoftOO_SDK}/${extProjectName}-${ghcFilesystem_VERSION}") ExternalProject_Add(${extProjectName} GIT_REPOSITORY "https://github.com/gulrak/filesystem.git" GIT_PROGRESS 1 GIT_TAG ${ghcFilesystem_GIT_TAG} - TMP_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/tmp/${CMAKE_BUILD_TYPE}" - STAMP_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Stamp" - DOWNLOAD_DIR ${EMsoft_SDK}/superbuild/${extProjectName}/Download - SOURCE_DIR "${EMsoft_SDK}/superbuild/${extProjectName}/Source" - 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" + DOWNLOAD_DIR ${EMsoftOO_SDK}/superbuild/${extProjectName}/Download + SOURCE_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Source" + BINARY_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}/Build/${CMAKE_BUILD_TYPE}" INSTALL_DIR "${ghcFilesystem_INSTALL}" CMAKE_ARGS @@ -49,11 +49,11 @@ ExternalProject_Add(${extProjectName} LOG_INSTALL 1 ) -#-- 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} "# GulRok FileSystem\n") -file(APPEND ${EMsoft_SDK_FILE} "set(ghcFilesystem_DIR \"\${EMsoft_SDK_ROOT}/${extProjectName}-${ghcFilesystem_VERSION}/lib/cmake/${extProjectName}\" CACHE PATH \"\")\n") -file(APPEND ${EMsoft_SDK_FILE} "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \${ghcFilesystem_DIR})\n") -file(APPEND ${EMsoft_SDK_FILE} "set(ghcFilesystem_VERSION \"${ghcFilesystem_VERSION}\" CACHE STRING \"\")\n") +file(APPEND ${EMsoftOO_SDK_FILE} "\n") +file(APPEND ${EMsoftOO_SDK_FILE} "#--------------------------------------------------------------------------------------------------\n") +file(APPEND ${EMsoftOO_SDK_FILE} "# GulRok FileSystem\n") +file(APPEND ${EMsoftOO_SDK_FILE} "set(ghcFilesystem_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${ghcFilesystem_VERSION}/lib/cmake/${extProjectName}\" CACHE PATH \"\")\n") +file(APPEND ${EMsoftOO_SDK_FILE} "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \${ghcFilesystem_DIR})\n") +file(APPEND ${EMsoftOO_SDK_FILE} "set(ghcFilesystem_VERSION \"${ghcFilesystem_VERSION}\" CACHE STRING \"\")\n") diff --git a/projects/nlopt.cmake b/projects/nlopt.cmake index 9970d4b..2c35dbf 100644 --- a/projects/nlopt.cmake +++ b/projects/nlopt.cmake @@ -14,14 +14,14 @@ message(STATUS "Building: ${extProjectName} ${NLopt_VERSION}: -DBUILD_NLOPT=${BU include(GNUInstallDirs) if(MSVC_IDE) - set(nlopt_INSTALL "${EMsoft_SDK}/${extProjectName}-${NLopt_VERSION}") + set(nlopt_INSTALL "${EMsoftOO_SDK}/${extProjectName}-${NLopt_VERSION}") elseif(WIN32) - set(nlopt_INSTALL "${EMsoft_SDK}/${extProjectName}-${NLopt_VERSION}-${CMAKE_BUILD_TYPE}") + set(nlopt_INSTALL "${EMsoftOO_SDK}/${extProjectName}-${NLopt_VERSION}-${CMAKE_BUILD_TYPE}") else() - set(nlopt_INSTALL "${EMsoft_SDK}/${extProjectName}-${NLopt_VERSION}-${CMAKE_BUILD_TYPE}") + set(nlopt_INSTALL "${EMsoftOO_SDK}/${extProjectName}-${NLopt_VERSION}-${CMAKE_BUILD_TYPE}") endif() -set_property(DIRECTORY PROPERTY EP_BASE ${EMsoft_SDK}/superbuild) +set_property(DIRECTORY PROPERTY EP_BASE ${EMsoftOO_SDK}/superbuild) # if(DREAM3D_USE_CUSTOM_DOWNLOAD_SITE) @@ -40,11 +40,11 @@ set_property(DIRECTORY PROPERTY EP_BASE ${EMsoft_SDK}/superbuild) ExternalProject_Add(${extProjectName} ${EP_SOURCE_ARGS} - TMP_DIR "${EMsoft_SDK}/superbuild/${extProjectName}-${NLopt_VERSION}/tmp/${CMAKE_BUILD_TYPE}" - STAMP_DIR "${EMsoft_SDK}/superbuild/${extProjectName}-${NLopt_VERSION}/Stamp" - DOWNLOAD_DIR ${EMsoft_SDK}/superbuild/${extProjectName}-${NLopt_VERSION}/Download - SOURCE_DIR "${EMsoft_SDK}/superbuild/${extProjectName}-${NLopt_VERSION}/Source" - BINARY_DIR "${EMsoft_SDK}/superbuild/${extProjectName}-${NLopt_VERSION}/Build/${CMAKE_BUILD_TYPE}" + TMP_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}-${NLopt_VERSION}/tmp/${CMAKE_BUILD_TYPE}" + STAMP_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}-${NLopt_VERSION}/Stamp" + DOWNLOAD_DIR ${EMsoftOO_SDK}/superbuild/${extProjectName}-${NLopt_VERSION}/Download + SOURCE_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}-${NLopt_VERSION}/Source" + BINARY_DIR "${EMsoftOO_SDK}/superbuild/${extProjectName}-${NLopt_VERSION}/Build/${CMAKE_BUILD_TYPE}" INSTALL_DIR "${nlopt_INSTALL}" CMAKE_ARGS @@ -73,17 +73,17 @@ ExternalProject_Add(${extProjectName} LOG_INSTALL 1 ) -#-- 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 DREAM3D for building -FILE(APPEND ${EMsoft_SDK_FILE} "\n") -FILE(APPEND ${EMsoft_SDK_FILE} "#--------------------------------------------------------------------------------------------------\n") -FILE(APPEND ${EMsoft_SDK_FILE} "# NLOpt\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "#--------------------------------------------------------------------------------------------------\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "# NLOpt\n") if(APPLE) - FILE(APPEND ${EMsoft_SDK_FILE} "set(NLopt_DIR \"\${EMsoft_SDK_ROOT}/${extProjectName}-${NLopt_VERSION}-\${BUILD_TYPE}/lib/cmake/${extProjectName}\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(NLopt_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${NLopt_VERSION}-\${BUILD_TYPE}/lib/cmake/${extProjectName}\" CACHE PATH \"\")\n") elseif(WIN32) - FILE(APPEND ${EMsoft_SDK_FILE} "set(NLopt_DIR \"\${EMsoft_SDK_ROOT}/${extProjectName}-${NLopt_VERSION}/lib/cmake/${extProjectName}\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(NLopt_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${NLopt_VERSION}/lib/cmake/${extProjectName}\" CACHE PATH \"\")\n") else() - FILE(APPEND ${EMsoft_SDK_FILE} "set(NLopt_DIR \"\${EMsoft_SDK_ROOT}/${extProjectName}-${NLopt_VERSION}-\${BUILD_TYPE}/${CMAKE_INSTALL_LIBDIR}/cmake/${extProjectName}\" CACHE PATH \"\")\n") + FILE(APPEND ${EMsoftOO_SDK_FILE} "set(NLopt_DIR \"\${EMsoftOO_SDK_ROOT}/${extProjectName}-${NLopt_VERSION}-\${BUILD_TYPE}/${CMAKE_INSTALL_LIBDIR}/cmake/${extProjectName}\" CACHE PATH \"\")\n") endif() -FILE(APPEND ${EMsoft_SDK_FILE} "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \${NLopt_DIR})\n") -FILE(APPEND ${EMsoft_SDK_FILE} "set(NLopt_VERSION \"${NLopt_VERSION}\" CACHE STRING \"\")\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \${NLopt_DIR})\n") +FILE(APPEND ${EMsoftOO_SDK_FILE} "set(NLopt_VERSION \"${NLopt_VERSION}\" CACHE STRING \"\")\n") diff --git a/projects/unix/Linux_EMsoft_SDK.cmake b/projects/unix/Linux_EMsoftOO_SDK.cmake similarity index 84% rename from projects/unix/Linux_EMsoft_SDK.cmake rename to projects/unix/Linux_EMsoftOO_SDK.cmake index d9e5946..1dd0c68 100644 --- a/projects/unix/Linux_EMsoft_SDK.cmake +++ b/projects/unix/Linux_EMsoftOO_SDK.cmake @@ -1,9 +1,9 @@ -# This is the EMsoft_SDK File. This file contains all the paths to the dependent libraries. +# This is the EMsoftOO_SDK File. This file contains all the paths to the dependent libraries. # This was generated for Version 6.3 Development of EMsoft. This SDK has C++11 Support ENABLED -if(NOT DEFINED EMsoft_FIRST_CONFIGURE) +if(NOT DEFINED EMsoftOO_FIRST_CONFIGURE) message(STATUS "*******************************************************") message(STATUS "* EMsoft First Configuration Run *") - message(STATUS "* EMsoft_SDK Loading from ${CMAKE_CURRENT_LIST_DIR} *") + message(STATUS "* EMsoftOO_SDK Loading from ${CMAKE_CURRENT_LIST_DIR} *") message(STATUS "*******************************************************") set(CMAKE_CXX_FLAGS "-std=c++11 -mfpmath=sse" CACHE STRING "" FORCE) set(CMAKE_CXX_STANDARD 14 CACHE STRING "" FORCE) @@ -14,8 +14,8 @@ endif() # Only Run this the first time when configuring EMsoft. After that the values # are cached properly and the user can add additional plugins through the normal # CMake GUI or CCMake programs. -if(NOT DEFINED EMsoft_FIRST_CONFIGURE) - set(EMsoft_FIRST_CONFIGURE "ON" CACHE STRING "Determines if EMsoft has already been configured at least once.") +if(NOT DEFINED EMsoftOO_FIRST_CONFIGURE) + set(EMsoftOO_FIRST_CONFIGURE "ON" CACHE STRING "Determines if EMsoft has already been configured at least once.") endif() #------------------------------------------------------------------------------- @@ -48,7 +48,7 @@ message(STATUS "The Current Build type being used is ${BUILD_TYPE}") # We are going to assume the use of GFortran. This will definitely # mess up the use of Intel IFort. I'll cross that bridge when someone # complains about it. -set(EMsoft_USE_GFORTRAN 1) +set(EMsoftOO_USE_GFORTRAN 1) # This also will help when using IDE's like QtCreator be able to find the compiler diff --git a/projects/win32/WIN_EMsoft_SDK.cmake b/projects/win32/WIN_EMsoftOO_SDK.cmake similarity index 83% rename from projects/win32/WIN_EMsoft_SDK.cmake rename to projects/win32/WIN_EMsoftOO_SDK.cmake index e7549da..296830f 100644 --- a/projects/win32/WIN_EMsoft_SDK.cmake +++ b/projects/win32/WIN_EMsoftOO_SDK.cmake @@ -1,8 +1,8 @@ -# This is the EMsoft_SDK File. This file contains all the paths to the dependent libraries. -if(NOT DEFINED EMsoft_FIRST_CONFIGURE) +# This is the EMsoftOO_SDK File. This file contains all the paths to the dependent libraries. +if(NOT DEFINED EMsoftOO_FIRST_CONFIGURE) message(STATUS "*******************************************************") message(STATUS "* EMsoft First Configuration Run *") - message(STATUS "* EMsoft_SDK Loading from ${CMAKE_CURRENT_LIST_DIR} *") + message(STATUS "* EMsoftOO_SDK Loading from ${CMAKE_CURRENT_LIST_DIR} *") message(STATUS "*******************************************************") set(CMAKE_Fortran_FLAGS "/W1 /nologo /fpp /libs:dll /threads /assume:byterecl" CACHE STRING "" FORCE) # set(CMAKE_EXE_LINKER_FLAGS " /machine:x64 /STACK:100000000" CACHE STRING "" FORCE) @@ -14,8 +14,8 @@ endif() # Only Run this the first time when configuring EMsoft. After that the values # are cached properly and the user can add additional plugins through the normal # CMake GUI or CCMake programs. -if(NOT DEFINED EMsoft_FIRST_CONFIGURE) - set(EMsoft_FIRST_CONFIGURE "ON" CACHE STRING "Determines if EMsoft has already been configured at least once.") +if(NOT DEFINED EMsoftOO_FIRST_CONFIGURE) + set(EMsoftOO_FIRST_CONFIGURE "ON" CACHE STRING "Determines if EMsoft has already been configured at least once.") endif() #-------------------------------------------------------------------------------