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

#3932 Octave : Cleanup

Browse Source
This commit is contained in:
Magne Sjaastad 2019-01-07 12:56:26 +01:00
parent 2213bab996
commit 6ca725b5e8
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OctavePlugin/CMakeLists.txt
View File

@ -71,12 +71,12 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
endif () endif ()
endif () endif ()
# TODO : Remove OCTAVE_HOME, replace with OCTAVE_ROOT_DIR
SET(OCTAVE_HOME ${OCTAVE_ROOT_DIR})
message ("Compiling Octave plugins using : ${OCTAVE_MKOCTFILE}") message ("Compiling Octave plugins using : ${OCTAVE_MKOCTFILE}")
if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
option(RESINSIGHT_OCTAVE_PLUGIN_QT "Compile Octave plugin using Qt located insided Octave root folder" OFF) option(RESINSIGHT_OCTAVE_PLUGIN_QT "Compile Octave plugin using Qt located insided Octave root folder" OFF)
endif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
if(RESINSIGHT_OCTAVE_PLUGIN_QT) if(RESINSIGHT_OCTAVE_PLUGIN_QT)
message(STATUS "Compiling Octave plugins using custom Qt located at ${OCTAVE_ROOT_DIR}") message(STATUS "Compiling Octave plugins using custom Qt located at ${OCTAVE_ROOT_DIR}")
@ -97,10 +97,6 @@ if(RESINSIGHT_OCTAVE_PLUGIN_QT)
SET(OCTAVE_QT_QTNETWORK_LIB QtNetwork4) SET(OCTAVE_QT_QTNETWORK_LIB QtNetwork4)
endif(EXISTS ${OCTAVE_ROOT_DIR}/qt5) endif(EXISTS ${OCTAVE_ROOT_DIR}/qt5)
list (APPEND MKOCTFILE_INCLUDE_DIRS ${OCTAVE_QT_INCLUDE_DIR})
list (APPEND MKOCTFILE_INCLUDE_DIRS ${OCTAVE_QT_QTCORE_INCLUDE_DIR})
list (APPEND MKOCTFILE_INCLUDE_DIRS ${OCTAVE_QT_QTNETWORK_INCLUDE_DIR})
else() else()
if (Qt5Core_FOUND) if (Qt5Core_FOUND)
@ -129,10 +125,12 @@ else()
endif(Qt5Core_FOUND) endif(Qt5Core_FOUND)
endif(RESINSIGHT_OCTAVE_PLUGIN_QT)
list (APPEND MKOCTFILE_INCLUDE_DIRS ${OCTAVE_QT_INCLUDE_DIR})
list (APPEND MKOCTFILE_INCLUDE_DIRS ${OCTAVE_QT_QTCORE_INCLUDE_DIR}) list (APPEND MKOCTFILE_INCLUDE_DIRS ${OCTAVE_QT_QTCORE_INCLUDE_DIR})
list (APPEND MKOCTFILE_INCLUDE_DIRS ${OCTAVE_QT_QTNETWORK_INCLUDE_DIR}) list (APPEND MKOCTFILE_INCLUDE_DIRS ${OCTAVE_QT_QTNETWORK_INCLUDE_DIR})
endif(RESINSIGHT_OCTAVE_PLUGIN_QT)
# Add socket interface source code folder # Add socket interface source code folder
list (APPEND MKOCTFILE_INCLUDE_DIRS ${ResInsight_SOURCE_DIR}/ApplicationCode/SocketInterface) list (APPEND MKOCTFILE_INCLUDE_DIRS ${ResInsight_SOURCE_DIR}/ApplicationCode/SocketInterface)
@ -165,7 +163,7 @@ if (OCTAVE_MKOCTFILE)
if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
add_custom_command( add_custom_command(
OUTPUT "${octFileName}" OUTPUT "${octFileName}"
COMMAND set "OCTAVE_HOME=${OCTAVE_HOME}" COMMAND set "OCTAVE_HOME=${OCTAVE_ROOT_DIR}"
COMMAND set "PATH=%OCTAVE_HOME%\\bin;%PATH%" COMMAND set "PATH=%OCTAVE_HOME%\\bin;%PATH%"
COMMAND ${OCTAVE_MKOCTFILE} COMMAND ${OCTAVE_MKOCTFILE}
${MKOCTFILE_INCLUDE_COMMAND_STRING} ${MKOCTFILE_INCLUDE_COMMAND_STRING}
@ -194,7 +192,7 @@ if (OCTAVE_MKOCTFILE)
else() else()
add_custom_command( add_custom_command(
OUTPUT "${octFileName}" OUTPUT "${octFileName}"
COMMAND OCTAVE_HOME=${OCTAVE_HOME} COMMAND OCTAVE_HOME=${OCTAVE_ROOT_DIR}
${OCTAVE_MKOCTFILE} ${OCTAVE_MKOCTFILE}
${MKOCTFILE_INCLUDE_COMMAND_STRING} ${MKOCTFILE_INCLUDE_COMMAND_STRING}
${RPATH_COMMAND} ${RPATH_COMMAND}