OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

System : Use TARGET_FILE_DIR instead of CONFIGURATION

Browse Source
This commit is contained in:
Magne Sjaastad
2020-05-11 08:03:42 +02:00
parent e3b350a982
commit 81571908af
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/CMakeLists.txt
View File

@@ -577,13 +577,13 @@ endif(MSVC)
foreach (FILE_TO_COPY ${RI_DLL_FILENAMES}) foreach (FILE_TO_COPY ${RI_DLL_FILENAMES})
add_custom_command(TARGET ResInsight POST_BUILD add_custom_command(TARGET ResInsight POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${FILE_TO_COPY}" ${FILE_TO_COPY}
"${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>") $<TARGET_FILE_DIR:ResInsight>)
if (_unityTargetName) if (_unityTargetName)
add_custom_command(TARGET ${_unityTargetName} POST_BUILD add_custom_command(TARGET ${_unityTargetName} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${FILE_TO_COPY}" ${FILE_TO_COPY}
"${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>") $<TARGET_FILE_DIR:ResInsight>)
endif() endif()
endforeach() endforeach()
@@ -714,7 +714,7 @@ if (RESINSIGHT_PRIVATE_INSTALL)
if (RESINSIGHT_ENABLE_GRPC) if (RESINSIGHT_ENABLE_GRPC)
set (GRPC_DLL_NAMES libprotobuf cares zlib1) set (GRPC_DLL_NAMES libprotobuf cares zlib1)
foreach (dllname ${GRPC_DLL_NAMES}) foreach (dllname ${GRPC_DLL_NAMES})
list(APPEND RESINSIGHT_FILES "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>/${dllname}.dll") list(APPEND RESINSIGHT_FILES $<TARGET_FILE_DIR:ResInsight>/${dllname}.dll)
endforeach(dllname ${GRPC_DLL_NAMES}) endforeach(dllname ${GRPC_DLL_NAMES})
endif() endif()

4
ApplicationCode/GeoMech/OdbReader/OdbSetup.cmake
View File

@@ -20,8 +20,8 @@ if (MSVC)
foreach (aDLL ${RI_ODB_DLLS}) foreach (aDLL ${RI_ODB_DLLS})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${RESINSIGHT_ODB_API_DIR}/lib/${aDLL}" ${RESINSIGHT_ODB_API_DIR}/lib/${aDLL}
"${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>") $<TARGET_FILE_DIR:ResInsight>)
endforeach() endforeach()
endif(MSVC) endif(MSVC)