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

Use simplified compile of Octave plugins on non-Windows

Browse Source 
p4#: 19012
This commit is contained in:
Magne Sjaastad 2012-10-04 12:28:31 +02:00
parent 1622df540b
commit f144134701
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OctavePlugin/CMakeLists.txt
View File

@ -57,7 +57,8 @@ else()
set(octFileName "${CMAKE_CURRENT_BINARY_DIR}/${baseFilename}.oct") set(octFileName "${CMAKE_CURRENT_BINARY_DIR}/${baseFilename}.oct")
if (${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND CMAKE_CL_64) if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
if (CMAKE_CL_64)
# The following line calls the build configuration for x86 VS2010 compiler # The following line calls the build configuration for x86 VS2010 compiler
# call "\"%VS100COMNTOOLS%../../VC/vcvarsall.bat\"" x86 # call "\"%VS100COMNTOOLS%../../VC/vcvarsall.bat\"" x86
add_custom_command( add_custom_command(
@ -79,6 +80,14 @@ else()
COMMENT "Generating ${octFileName}" COMMENT "Generating ${octFileName}"
) )
endif() endif()
else()
add_custom_command(
OUTPUT "${octFileName}"
COMMAND ${MKOCTFILE_EXECUTABLE} -I${QT_QTNETWORK_INCLUDE_DIR} -I${QT_QTCORE_INCLUDE_DIR} -I${QT_INCLUDE_DIR} ${RPATH_COMMAND} -L${QT_LIBRARY_DIR} -lQtCore${QT_LIBRARY_POSTFIX} -lQtNetwork${QT_LIBRARY_POSTFIX} -o "${octFileName}" "${srcFileName}"
DEPENDS "${srcFileName}"
COMMENT "Generating ${octFileName}"
)
endif()
list(APPEND OCTAVE_BINARY_OCT_FILES "${octFileName}") list(APPEND OCTAVE_BINARY_OCT_FILES "${octFileName}")