merge from master

[tools/sat_salome.git] / products / nlopt.pyconf

diff --git a/products/nlopt.pyconf b/products/nlopt.pyconf
index 00618088de2479713968d80438518f1c08b5272b..eb3ac1b8f6db26fa0bf589e02f70d6bbea754fef 100644 (file)
--- a/products/nlopt.pyconf
+++ b/products/nlopt.pyconf
@@ -8,7 +8,7 @@ default :
     {
        env_script : $name + ".py"
     }
-    depend : ['Python']
+    depend : ['Python', 'numpy'] # numpy mandatory otherwise no python API is generated
     build_depend : ["cmake", "swig"]
     patches : []
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
@@ -23,7 +23,6 @@ default :
 
 default_win:
 {
-   depend : ['Python']
    properties :
    {
      incremental : "yes"
@@ -33,11 +32,10 @@ default_win:
 
 version_2_5_0:
 {
-    build_source : "cmake"
-    cmake_options : "-DBUILD_SHARED_LIBS:BOOL=ON -DNLOPT_MATLAB:BOOL=OFF -DNLOPT_OCTAVE:BOOL=OFF -DNLOPT_GUILE:BOOL=OFF -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
+    compil_script :  "nlopt-2.5.0" + $VARS.scriptExtension
 }
 
-version_2_5_0_win:
+version_2_6_0:
 {
-    build_source : "script"
+    compil_script :  "nlopt-2.6.0" + $VARS.scriptExtension
 }