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

Do not include Octave plugin for Windows 64-bit, as no precompiled Octave 64-bit is available.

Browse Source 
p4#: 18838
This commit is contained in:
Magne Sjaastad 2012-09-20 15:15:43 +02:00
parent 738d6cc8dc
commit c4e5d9e842
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -111,7 +111,11 @@ set (CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/Install/)
# Application # Application
################################################################################ ################################################################################
add_subdirectory(ApplicationCode) add_subdirectory(ApplicationCode)
add_subdirectory(OctavePlugin)
# Do not build Octave plugins for Windows 64-bit, as there is no precompiled 64-bit Octave available
if (NOT CMAKE_CL_64)
add_subdirectory(OctavePlugin)
endif()
# #
################################################################################ ################################################################################

6
OctavePlugin/CMakeLists.txt
View File

@ -24,6 +24,8 @@ if(NOT MKOCTFILE_EXECUTABLE)
message(WARNING "Failed to find mkoctfile") message(WARNING "Failed to find mkoctfile")
else() else()
get_filename_component(OCTAVE_PATH ${MKOCTFILE_EXECUTABLE} PATH)
foreach(srcFileName IN LISTS CPP_SOURCES) foreach(srcFileName IN LISTS CPP_SOURCES)
if(NOT IS_ABSOLUTE "${srcFileName}") if(NOT IS_ABSOLUTE "${srcFileName}")
@ -34,12 +36,12 @@ else()
set(octFileName "${CMAKE_CURRENT_BINARY_DIR}/${baseFilename}.oct") set(octFileName "${CMAKE_CURRENT_BINARY_DIR}/${baseFilename}.oct")
add_custom_command(
add_custom_command(
OUTPUT "${octFileName}" 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}" 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}" DEPENDS "${srcFileName}"
COMMENT "Generating ${octFileName}" COMMENT "Generating ${octFileName}"
WORKING_DIRECTORY "${OCTAVE_PATH}"
) )
list(APPEND OCTAVE_BINARY_OCT_FILES "${octFileName}") list(APPEND OCTAVE_BINARY_OCT_FILES "${octFileName}")