From: Steven G. Johnson <stevenj@mit.edu>
Date: Wed, 2 Nov 2016 14:31:09 +0000 (-0400)
Subject: Merge pull request #96 from jschueller/octave-site-dir
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2dad0d39a5d195f209ba01da70bfa901cbe87e12;p=nlopt.git

Merge pull request #96 from jschueller/octave-site-dir

Allow to modify Python & octave site dir
---

2dad0d39a5d195f209ba01da70bfa901cbe87e12
diff --cc octave/CMakeLists.txt
index c84a2f4,fb41b63..1b4c087
--- a/octave/CMakeLists.txt
+++ b/octave/CMakeLists.txt
@@@ -16,14 -16,18 +16,18 @@@ if (OCTAVE_FOUND
    include_directories (${CMAKE_CURRENT_BINARY_DIR})
    octave_add_oct (nlopt_optimize SOURCES nlopt_optimize-oct.cc ${CMAKE_CURRENT_BINARY_DIR}/nlopt_optimize_usage.h LINK_LIBRARIES ${nlopt_lib})
  
-   file (RELATIVE_PATH PKG_OCTAVE_OCT_SITE_DIR ${OCTAVE_ROOT_DIR} ${OCTAVE_OCT_SITE_DIR})
-   install (TARGETS nlopt_optimize DESTINATION ${PKG_OCTAVE_OCT_SITE_DIR})
+   if (NOT DEFINED INSTALL_OCT_DIR)
+     file (RELATIVE_PATH INSTALL_OCT_DIR ${OCTAVE_ROOT_DIR} ${OCTAVE_OCT_SITE_DIR})
+   endif ()
+   install (TARGETS nlopt_optimize DESTINATION ${INSTALL_OCT_DIR})
  
    set (MFILES NLOPT_GN_DIRECT.m NLOPT_GN_DIRECT_L.m NLOPT_GN_DIRECT_L_RAND.m NLOPT_GN_DIRECT_NOSCAL.m NLOPT_GN_DIRECT_L_NOSCAL.m NLOPT_GN_DIRECT_L_RAND_NOSCAL.m NLOPT_GN_ORIG_DIRECT.m NLOPT_GN_ORIG_DIRECT_L.m NLOPT_GD_STOGO.m NLOPT_GD_STOGO_RAND.m NLOPT_LD_LBFGS_NOCEDAL.m NLOPT_LD_LBFGS.m NLOPT_LN_PRAXIS.m NLOPT_LD_VAR1.m NLOPT_LD_VAR2.m NLOPT_LD_TNEWTON.m NLOPT_LD_TNEWTON_RESTART.m NLOPT_LD_TNEWTON_PRECOND.m NLOPT_LD_TNEWTON_PRECOND_RESTART.m NLOPT_GN_CRS2_LM.m NLOPT_GN_MLSL.m NLOPT_GD_MLSL.m NLOPT_GN_MLSL_LDS.m NLOPT_GD_MLSL_LDS.m NLOPT_LD_MMA.m NLOPT_LN_COBYLA.m NLOPT_LN_NEWUOA.m NLOPT_LN_NEWUOA_BOUND.m NLOPT_LN_NELDERMEAD.m NLOPT_LN_SBPLX.m NLOPT_LN_AUGLAG.m NLOPT_LD_AUGLAG.m NLOPT_LN_AUGLAG_EQ.m NLOPT_LD_AUGLAG_EQ.m NLOPT_LN_BOBYQA.m NLOPT_GN_ISRES.m NLOPT_AUGLAG.m NLOPT_AUGLAG_EQ.m NLOPT_G_MLSL.m NLOPT_G_MLSL_LDS.m NLOPT_LD_SLSQP.m NLOPT_LD_CCSAQ.m NLOPT_GN_ESCH.m)
 -  set (M_DATA ${MFILES} nlopt_minimize.m nlopt_minimize_constrained.m nlopt_optimize.m)
 +  set (M_DATA ${MFILES} nlopt_minimize.m nlopt_minimize_constrained.m)
  
-   file (RELATIVE_PATH PKG_OCTAVE_M_SITE_DIR ${OCTAVE_ROOT_DIR} ${OCTAVE_M_SITE_DIR})
-   install (FILES ${M_DATA} DESTINATION ${PKG_OCTAVE_M_SITE_DIR})
+   if (NOT DEFINED INSTALL_M_DIR)
+     file (RELATIVE_PATH INSTALL_M_DIR ${OCTAVE_ROOT_DIR} ${OCTAVE_M_SITE_DIR})
+   endif ()
+   install (FILES ${M_DATA} DESTINATION ${INSTALL_M_DIR})
  endif ()
  
  if (Matlab_FOUND)