Skip to content

Commit

Permalink
[cmake] Bump w2dynamics commit to b52a73f
Browse files Browse the repository at this point in the history
  • Loading branch information
Wentzell committed Mar 28, 2024
1 parent 5da183c commit 405c7c3
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 27 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ message(STATUS "-------- BUILD-TYPE: ${CMAKE_BUILD_TYPE} --------")

# w2dynamics specific variables
get_property(FFTW_LIBRARIES TARGET triqs::fftw PROPERTY INTERFACE_LINK_LIBRARIES)
set(W2DYN_GIT_HASH 8a9097b)
set(W2DYN_GIT_HASH b52a73f)
message(STATUS "w2dynamics git hash: ${W2DYN_GIT_HASH}")

include(FetchContent)
Expand Down
26 changes: 0 additions & 26 deletions w2dynamics.patch
Original file line number Diff line number Diff line change
Expand Up @@ -353,32 +353,6 @@ index 8f26fa8..3aa6a1a 100644
if (NOT "${SUCCESS}" STREQUAL "0")
execute_process(COMMAND pip "install" "--user" ${module} RESULT_VARIABLE SUCCESS)
if (NOT "${SUCCESS}" STREQUAL "0")
diff --git a/src/ctqmc_fortran/CMakeLists.txt b/src/ctqmc_fortran/CMakeLists.txt
index fad98e2..d5e8b7e 100644
--- a/src/ctqmc_fortran/CMakeLists.txt
+++ b/src/ctqmc_fortran/CMakeLists.txt
@@ -68,7 +68,7 @@ endif (USE_NFFT)
COMPILE_OPTIONS $<$<AND:$<C_COMPILER_ID:Clang>,$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,16>>:-Wno-error=incompatible-function-pointer-types>)
target_link_libraries(${_name} PRIVATE fortranobject CTQMCLIB ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES} ${FFTW_LIBRARIES} $<$<BOOL:${USE_NFFT}>:nfft>)
add_custom_command(TARGET ${_name} POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy -t "${PROJECT_SOURCE_DIR}/w2dyn/auxiliaries" $<TARGET_FILE:${_name}>
+ COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${_name}> ${PROJECT_SOURCE_DIR}/w2dyn/auxiliaries/
COMMAND_EXPAND_LISTS)

IF(WIN32)
diff --git a/src/maxent/CMakeLists.txt b/src/maxent/CMakeLists.txt
index 033ed92..39978c7 100644
--- a/src/maxent/CMakeLists.txt
+++ b/src/maxent/CMakeLists.txt
@@ -53,7 +53,7 @@ set_target_properties(MAXENTLIB PROPERTIES COMPILE_FLAGS "-DLAPACK77_Interface")
COMPILE_OPTIONS $<$<AND:$<C_COMPILER_ID:Clang>,$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,16>>:-Wno-error=incompatible-function-pointer-types>)
target_link_libraries(${_name} PRIVATE fortranobject MAXENTLIB ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES})
add_custom_command(TARGET ${_name} POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy -t "${PROJECT_SOURCE_DIR}/w2dyn/maxent" $<TARGET_FILE:${_name}>
+ COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${_name}> ${PROJECT_SOURCE_DIR}/w2dyn/maxent/
COMMAND_EXPAND_LISTS)

#####################################
diff --git a/testsuite/ctqmc.tests/CMakeLists.txt b/testsuite/ctqmc.tests/CMakeLists.txt
index 5c27ff4..403b464 100644
--- a/testsuite/ctqmc.tests/CMakeLists.txt
Expand Down

0 comments on commit 405c7c3

Please sign in to comment.