diff --git a/.github/workflows/windows_build_test.yml b/.github/workflows/windows_build_test.yml index 442a931ae..ae6ff7061 100644 --- a/.github/workflows/windows_build_test.yml +++ b/.github/workflows/windows_build_test.yml @@ -3,33 +3,33 @@ name: Windows Build/Test on: # allows us to run workflows manually workflow_dispatch: - pull_request: - branches: - - develop - paths-ignore: - - '.github/workflows/docker_publish.yml' - - '.github/workflows/linux_build_test.yml' - - '.github/workflows/linux_upstream_test_*' - - '.github/workflows/mac_build_test.yml' - - '.github/workflows/housekeeping.yml' - - '.github/workflows/changelog_test.yml' - - '.github/actions/**' - - 'CI/**' - - 'doc/**' + # pull_request: + # branches: + # - develop + # paths-ignore: + # - '.github/workflows/docker_publish.yml' + # - '.github/workflows/linux_build_test.yml' + # - '.github/workflows/linux_upstream_test_*' + # - '.github/workflows/mac_build_test.yml' + # - '.github/workflows/housekeeping.yml' + # - '.github/workflows/changelog_test.yml' + # - '.github/actions/**' + # - 'CI/**' + # - 'doc/**' - push: - branches: - - develop - paths-ignore: - - '.github/workflows/docker_publish.yml' - - '.github/workflows/linux_build_test.yml' - - '.github/workflows/linux_upstream_test_*' - - '.github/workflows/mac_build_test.yml' - - '.github/workflows/housekeeping.yml' - - '.github/workflows/changelog_test.yml' - - '.github/actions/**' - - 'CI/**' - - 'doc/**' + # push: + # branches: + # - develop + # paths-ignore: + # - '.github/workflows/docker_publish.yml' + # - '.github/workflows/linux_build_test.yml' + # - '.github/workflows/linux_upstream_test_*' + # - '.github/workflows/mac_build_test.yml' + # - '.github/workflows/housekeeping.yml' + # - '.github/workflows/changelog_test.yml' + # - '.github/actions/**' + # - 'CI/**' + # - 'doc/**' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -41,7 +41,8 @@ jobs: - uses: conda-incubator/setup-miniconda@v3 with: - auto-activate-base: true + auto-update-conda: true + auto-activate-base: false activate-environment: "" # yaml-cpp package has conflicting gtest headers and is not needed for this project @@ -49,8 +50,7 @@ jobs: shell: bash -l {0} run: | conda install curl eigen - conda install -c conda-forge hdf5=1.10.6 - conda remove -y yaml-cpp + conda install -c conda-forge hdf5==1.10.6 - name: Environment Variables shell: bash -l {0} @@ -114,12 +114,15 @@ jobs: -DMOAB_DIR=../install_dir \ -DHDF5_ROOT="${CONDA_LOC}" \ -DHDF5_hdf5_LIBRARY_RELEASE="${CONDA_LOC}/lib/libhdf5_hl.lib;${CONDA_LOC}/lib/libhdf5.lib;${CONDA_LOC}/lib/zlib.lib;${CONDA_LOC}/lib/libhdf5_cpp.lib" \ - -DCMAKE_INSTALL_PREFIX=../install_dir/ \ - -DCMAKE_EXE_LINKER_FLAGS="" \ - -DCMAKE_MODULE_LINKER_FLAGS="" \ - -DCMAKE_SHARED_LINKER_FLAGS="" \ + -DCMAKE_EXE_LINKER_FLAGS="/std:c++latest -DH5_BUILT_AS_DYNAMIC_LIB" \ + -DCMAKE_MODULE_LINKER_FLAGS="/std:c++latest" \ + -DCMAKE_SHARED_LINKER_FLAGS="/std:c++latest" \ -DCMAKE_STATIC_LINKER_FLAGS="" \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_EXE_LINKER_FLAGS="" \ + -DCMAKE_INSTALL_PREFIX=../install_dir/ \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_COMPILER="C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.27.29110/bin/Hostx64/x64/cl.exe" \ + -DCMAKE_CXX_COMPILER="C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.27.29110/bin/Hostx64/x64/cl.exe" cmake --build . --config Release cmake --install . --config Release diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ab2034a1..cd6c24fcf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,15 +1,16 @@ project(DAGMC) -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.18) enable_language(CXX) # Set DAGMC version set(DAGMC_MAJOR_VERSION 3) set(DAGMC_MINOR_VERSION 2) -set(DAGMC_PATCH_VERSION 3) +set(DAGMC_PATCH_VERSION 4) set(DAGMC_VERSION ${DAGMC_MAJOR_VERSION}.${DAGMC_MINOR_VERSION}.${DAGMC_PATCH_VERSION}) if(MSVC) set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE) + add_definitions( -DH5_BUILT_AS_DYNAMIC_LIB ) endif() @@ -29,22 +30,6 @@ if(GIT_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") endif() option(GIT_SUBMODULE "Check submodules during build" ON) - if(GIT_SUBMODULE) - message(STATUS "Submodule update") - execute_process(COMMAND ${GIT_EXECUTABLE} "submodule" "update" "--init" "--recursive" - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - RESULT_VARIABLE GIT_SUBMOD_RESULT) - if(NOT GIT_SUBMOD_RESULT EQUAL 0) - message(FATAL_ERROR "git submodule update --init --recursive failed with \ - ${GIT_SUBMOD_RESULT}, please checkout submodules") - endif() - endif() -endif() - -# Check to see if submodules exist (by checking one) -if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/pyne/pyne/readme.rst") - message(FATAL_ERROR "The git submodules were not downloaded! GIT_SUBMODULE was \ - turned off or failed. Please update submodules and try again.") endif() # Make the scripts in the "cmake" directory available to CMake diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst index 2a3cd5c06..71e4daae4 100644 --- a/doc/CHANGELOG.rst +++ b/doc/CHANGELOG.rst @@ -7,10 +7,13 @@ DAGMC Changelog Next version ==================== +v3.2.4 +==================== + **Changed:** * Adding info messages to CMake output for double down (#962) - * Update hdf5 to v1.14.3 from v1.10.4 (#931 #933) + * Update hdf5 to v1.14.3 from v1.10.4 for linux builds (#931 #933) * Ensure implicit complement handle is placed at the back of DAGMC volume indices (#935) * Update MOAB to 5.5.1 from 5.3.0 (#939 #940) * Update README regarding OpenMC (#938) @@ -21,6 +24,8 @@ Next version * Update github actions to newer versions as necessary (#958) * CMake error message update (#960) * Updated documentation to build dependencies (#963) + * Pause support for Windows (#966) + * Localize invocation of git submodule for PyNE (#968) v3.2.3 ==================== diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 11fe95e9d..e9a2df084 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -15,6 +15,23 @@ if (BUILD_MCNP5 OR BUILD_MCNP6 OR BUILD_GEANT4 OR BUILD_FLUKA OR BUILD_CI_TESTS) endif () if (BUILD_UWUW) add_subdirectory(uwuw) + + if(GIT_SUBMODULE) + message(STATUS "Submodule update") + execute_process(COMMAND ${GIT_EXECUTABLE} "submodule" "update" "--init" "--recursive" + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + RESULT_VARIABLE GIT_SUBMOD_RESULT) + if(NOT GIT_SUBMOD_RESULT EQUAL 0) + message(FATAL_ERROR "git submodule update --init --recursive failed with \ + ${GIT_SUBMOD_RESULT}, please checkout submodules") + endif() + endif() + + # Check to see if submodules exist (by checking one) + if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/pyne/pyne/readme.rst") + message(FATAL_ERROR "The git submodules were not downloaded! GIT_SUBMODULE was \ + turned off or failed. Please update submodules and try again.") + endif() add_subdirectory(pyne) endif ()