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 missing rename to ApplicationLibCode

Browse Source
This commit is contained in:
Magne Sjaastad 2021-01-11 22:27:57 +01:00
parent 140c292a93
commit 828421e86b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OctavePlugin/CMakeLists.txt
View File

@ -118,7 +118,7 @@ list (APPEND MKOCTFILE_INCLUDE_DIRS ${OCTAVE_QT_QTNETWORK_INCLUDE_DIR})
# 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}/ApplicationLibCode/SocketInterface)
list (REMOVE_DUPLICATES MKOCTFILE_INCLUDE_DIRS) list (REMOVE_DUPLICATES MKOCTFILE_INCLUDE_DIRS)
foreach (item ${MKOCTFILE_INCLUDE_DIRS}) foreach (item ${MKOCTFILE_INCLUDE_DIRS})
@ -166,7 +166,7 @@ if (OCTAVE_MKOCTFILE)
COMMAND ${OCTAVE_MKOCTFILE} COMMAND ${OCTAVE_MKOCTFILE}
${QT_INCLUDES} ${QT_INCLUDES}
${QT_FRAMEWORKS} ${QT_FRAMEWORKS}
-I${ResInsight_SOURCE_DIR}/ApplicationCode/SocketInterface -I${ResInsight_SOURCE_DIR}/ApplicationLibCode/SocketInterface
${RPATH_COMMAND} ${RPATH_COMMAND}
-L${QT_LIBRARY_DIR} -Wl,-framework,QtCore -Wl,-framework,QtNetwork -L${QT_LIBRARY_DIR} -Wl,-framework,QtCore -Wl,-framework,QtNetwork
-o "${octFileName}" -o "${octFileName}"
@ -220,13 +220,13 @@ add_custom_target(octave_plugins ALL DEPENDS
add_custom_command(TARGET octave_plugins POST_BUILD add_custom_command(TARGET octave_plugins POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${oct_bin}" "${oct_bin}"
"${CMAKE_CURRENT_BINARY_DIR}/../ApplicationCode/$<CONFIGURATION>/${Filename}" "${CMAKE_CURRENT_BINARY_DIR}/../ApplicationLibCode/$<CONFIGURATION>/${Filename}"
) )
else() else()
add_custom_command(TARGET octave_plugins POST_BUILD add_custom_command(TARGET octave_plugins POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${oct_bin}" "${oct_bin}"
"${CMAKE_CURRENT_BINARY_DIR}/../ApplicationCode/${Filename}" "${CMAKE_CURRENT_BINARY_DIR}/../ApplicationLibCode/${Filename}"
) )
endif() endif()
endforeach( oct_bin ) endforeach( oct_bin )

2
OctavePlugin/riSettings.h
View File

@ -16,7 +16,7 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "../ApplicationCode/SocketInterface/RiaSocketServerDefines.h" #include "../ApplicationLibCode/SocketInterface/RiaSocketServerDefines.h"
namespace riOctavePlugin namespace riOctavePlugin
{ {