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

Improved CMakeSetup for OdbTest app

Browse Source 
Cleaned away the hardcoded paths. Made options instead.
This commit is contained in:
Jacob Støren
2015-04-28 10:45:00 +02:00
parent 1e88b38e69
commit 936d6553cf
4 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ApplicationCode/GeoMech/OdbReader/CMakeLists.txt
View File

@@ -7,7 +7,7 @@ add_definitions(-DABQ_WIN86_64)
include_directories(
${RI_ODB_API_DIR}/include
${RESINSIGHT_ODB_API_DIR}/include
${RigGeoMechDataModel_SOURCE_DIR}
${LibCore_SOURCE_DIR}
)
@@ -17,24 +17,25 @@ add_library( ${PROJECT_NAME}
RifOdbReader.cpp
RifGeoMechReaderInterface.h
RifGeoMechReaderInterface.cpp
OdbSetup.cmake
)
list(APPEND RI_ODB_LIBS
${RI_ODB_API_DIR}/lib/ABQSMAOdbDdbOdb.lib
${RI_ODB_API_DIR}/lib/ABQSMAOdbApi.lib
${RI_ODB_API_DIR}/lib/ABQSMAOdbCore.lib
${RI_ODB_API_DIR}/lib/ABQSMAOdbCoreGeom.lib
${RI_ODB_API_DIR}/lib/ABQSMAOdbAttrEO.lib
${RI_ODB_API_DIR}/lib/ABQSMAAbuBasicUtils.lib
${RI_ODB_API_DIR}/lib/ABQSMABasShared.lib
${RI_ODB_API_DIR}/lib/ABQSMABasCoreUtils.lib
${RI_ODB_API_DIR}/lib/ABQSMAStiCAE_StableTime.lib
${RI_ODB_API_DIR}/lib/ABQSMABasMem.lib
${RI_ODB_API_DIR}/lib/ABQSMAAbuGeom.lib
${RI_ODB_API_DIR}/lib/ABQSMARomDiagEx.lib
${RI_ODB_API_DIR}/lib/ABQSMASspUmaCore.lib
${RI_ODB_API_DIR}/lib/ABQSMASimInterface.lib
${RI_ODB_API_DIR}/lib/ABQSMAMtxCoreModule.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAOdbDdbOdb.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAOdbApi.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAOdbCore.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAOdbCoreGeom.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAOdbAttrEO.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAAbuBasicUtils.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMABasShared.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMABasCoreUtils.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAStiCAE_StableTime.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMABasMem.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAAbuGeom.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMARomDiagEx.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMASspUmaCore.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMASimInterface.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAMtxCoreModule.lib
)
target_link_libraries(${PROJECT_NAME} ${RI_ODB_LIBS} RigGeoMechDataModel LibCore)

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

@@ -1,9 +1,10 @@
# Copy Odb Dlls
set(RESINSIGHT_ODB_API_DIR "" CACHE PATH "Path tho the ODB api from Simulia")
if (MSVC)
# Find all the dlls
file (GLOB RI_ALL_ODB_DLLS ${RI_ODB_API_DIR}/lib/*.dll)
file (GLOB RI_ALL_ODB_DLLS ${RESINSIGHT_ODB_API_DIR}/lib/*.dll)
# Strip off the path
foreach (aDLL ${RI_ALL_ODB_DLLS})
@@ -12,9 +13,15 @@ if (MSVC)
endforeach(aDLL)
# Copy to target directory
#foreach (aDLL ${RI_ODB_DLLS})
# add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
# COMMAND ${CMAKE_COMMAND} -E copy_if_different "${RI_ODB_API_DIR}/lib/${aDLL}" "$<TARGET_FILE_DIR:${PROJECT_NAME}>")
#endforeach()
foreach (aDLL ${RI_ODB_DLLS})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${RI_ODB_API_DIR}/lib/${aDLL}" "$<TARGET_FILE_DIR:${PROJECT_NAME}>")
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${RESINSIGHT_ODB_API_DIR}/lib/${aDLL}"
"${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>")
endforeach()
endif(MSVC)