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

Fix compile of ResInsight without Octave plugins

Browse Source
This commit is contained in:
Magne Sjaastad
2013-10-24 16:03:32 +02:00
parent 5c4be3c16d
commit 2deb434a07
1 changed files with 109 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
OctavePlugin/CMakeLists.txt
View File

@@ -69,8 +69,8 @@ endif()
# Clear the list of binary oct files to be produced
set(OCTAVE_BINARY_OCT_FILES)
foreach(srcFileName IN LISTS CPP_SOURCES)
if (RESINSIGHT_OCTAVE_PLUGIN_QMAKE AND RESINSIGHT_OCTAVE_PLUGIN_MKOCTFILE)
foreach(srcFileName IN LISTS CPP_SOURCES)
if(NOT IS_ABSOLUTE "${srcFileName}")
set(srcFileName "${CMAKE_CURRENT_SOURCE_DIR}/${srcFileName}")
@@ -116,9 +116,9 @@ foreach(srcFileName IN LISTS CPP_SOURCES)
list(APPEND OCTAVE_BINARY_OCT_FILES "${octFileName}")
endforeach()
endforeach()
add_custom_target(octave_plugins ALL DEPENDS
add_custom_target(octave_plugins ALL DEPENDS
"${CMAKE_CURRENT_BINARY_DIR}/riGetActiveCellProperty.oct"
"${CMAKE_CURRENT_BINARY_DIR}/riSetActiveCellProperty.oct"
"${CMAKE_CURRENT_BINARY_DIR}/riGetActiveCellInfo.oct"
@@ -142,12 +142,12 @@ add_custom_target(octave_plugins ALL DEPENDS
"${CMAKE_CURRENT_BINARY_DIR}/riGetWellStatus.oct"
"${CMAKE_CURRENT_BINARY_DIR}/riGetWellCells.oct"
SOURCES ${CPP_SOURCES}
)
)
# Copy Octave generated *.oct files to application folder, will make it possible to use Octave functions
# directly from the location of the ResInsight binaries
if (true)
# Copy Octave generated *.oct files to application folder, will make it possible to use Octave functions
# directly from the location of the ResInsight binaries
if (true)
foreach (oct_bin ${OCTAVE_BINARY_OCT_FILES})
get_filename_component(Filename "${oct_bin}" NAME)
@@ -166,15 +166,15 @@ if (true)
)
endif()
endforeach( oct_bin )
endif()
endif()
# Make ResInsight dependant on Octave, makes it easiser to debug Octave functionality by compiling ResInsight
add_dependencies(ResInsight octave_plugins)
# Make ResInsight dependant on Octave, makes it easiser to debug Octave functionality by compiling ResInsight
add_dependencies(ResInsight octave_plugins)
if (RESINSIGHT_PRIVATE_INSTALL)
if (RESINSIGHT_PRIVATE_INSTALL)
install(FILES ${OCTAVE_BINARY_OCT_FILES} DESTINATION ${RESINSIGHT_FINAL_NAME})
else (RESINSIGHT_PRIVATE_INSTALL)
else (RESINSIGHT_PRIVATE_INSTALL)
# probe for site location of .oct files
if (NOT OCTAVE_SITE_OCT_DIR)
find_program (OCTAVE_CONFIG_COMMAND
@@ -191,5 +191,8 @@ else (RESINSIGHT_PRIVATE_INSTALL)
install (FILES ${OCTAVE_BINARY_OCT_FILES}
DESTINATION ${OCTAVE_SITE_OCT_DIR}
)
endif (RESINSIGHT_PRIVATE_INSTALL)
endif (RESINSIGHT_PRIVATE_INSTALL)
endif (RESINSIGHT_OCTAVE_PLUGIN_QMAKE AND RESINSIGHT_OCTAVE_PLUGIN_MKOCTFILE)