forked from pool/pfstools
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index cc22e80..ecee7ca 100755
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -281,8 +281,6 @@ OPTION(WITH_HDRVC "Compile HDRVC (internal release only)" OFF)
|
|
|
|
OPTION(WITH_Octave "Compile Octave files" ON)
|
|
|
|
-SET (OCTAVE_DEST_DIR "" CACHE PATH "Install octave .m and .oct files in this directory")
|
|
-
|
|
if( OCTAVE_DEST_DIR )
|
|
set( OCTAVE_OCT_DIR ${OCTAVE_DEST_DIR} )
|
|
set( OCTAVE_M_DIR ${OCTAVE_DEST_DIR} )
|
|
@@ -302,7 +300,8 @@ if( WITH_Octave )
|
|
if(MKOCTFILE)
|
|
message(STATUS "mkoctfile found.")
|
|
endif()
|
|
-
|
|
+ execute_process(COMMAND octave-config --oct-site-dir OUTPUT_VARIABLE OCTAVE_OCT_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
+ execute_process(COMMAND octave-config --m-site-dir OUTPUT_VARIABLE OCTAVE_M_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
endif( WITH_Octave )
|
|
|
|
# ======== OpenCV ===========
|
|
diff --git a/src/octave/CMakeLists.txt b/src/octave/CMakeLists.txt
|
|
index 89d8369..4f75c61 100644
|
|
--- a/src/octave/CMakeLists.txt
|
|
+++ b/src/octave/CMakeLists.txt
|
|
@@ -40,11 +40,11 @@ endforeach(SRC)
|
|
foreach(SRC ${SRC_OCT})
|
|
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${SRC}.oct
|
|
PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE OWNER_WRITE WORLD_READ GROUP_READ OWNER_READ
|
|
- DESTINATION "${OCTAVE_OCT_DIR}")
|
|
+ DESTINATION "${OCTAVE_OCT_DIR}/pfstools")
|
|
endforeach(SRC)
|
|
|
|
foreach(SRC ${SRC_M})
|
|
- install (FILES ${SRC} DESTINATION "${OCTAVE_M_DIR}")
|
|
+ install (FILES ${SRC} DESTINATION "${OCTAVE_M_DIR}/pfstools")
|
|
endforeach(SRC)
|
|
|
|
install (FILES ${OCT_SCRIPTS}
|