Commit 13823d99 authored by Laurent Belcour's avatar Laurent Belcour
Browse files

Merge of 'master' into 'cmake-test-suite' to obtain latest patches on Windows build

parents b7871b36 5ced7a97
build
.sconf_temp
.sconsign.dblite
config.log
config.py
documents/doxygen
.*.swp
*~
,*
moc_*
Makefile
*.pyc
*.o
......@@ -17,22 +7,25 @@ Makefile
*.rational
*.errorplot
*.gnuplot
oprofile_data
*.so.*
*.so
*.la
*.a
*.dylib
*.exe
build/
external/build
external/Ipopt-*
external/ceres-solver-*
external/eigen-*
external/glog-*
external/nlopt-*
/sources/build/brdf2brdf
/sources/build/brdf2data
/sources/build/brdf2gnuplot
/sources/build/brdf2moments
/sources/build/data2brdf
/sources/build/data2data
/tests/*.log
sources/build/brdf2brdf
sources/build/brdf2data
sources/build/brdf2gnuplot
sources/build/brdf2moments
sources/build/data2brdf
sources/build/data2data
tests/*.log
documents/doxygen/
.vscode/settings\.json
......@@ -155,6 +155,9 @@ target_link_libraries(core ${CMAKE_DL_LIBS})
# set(CMAKE_SHARED_LIBRARY_PREFIX "")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugins)
# Note: Required on windows to build the plugins in the 'plugins'
# directory. [Laurent] I have no idea why this is needed.
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugins)
# Data
alta_add_plugin(data_astm data_io/astm.cpp)
......@@ -221,6 +224,10 @@ endif()
# Python bindings
if(PYTHONLIBS_FOUND AND PYBIND_FOUND)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/python)
# Note: Required on windows to build the python dll in the 'python'
# directory. [Laurent] I have no idea why this is needed.
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/python)
include_directories(${PYTHON_INCLUDE_DIRS})
add_library(alta SHARED sources/python/alta.cpp)
target_link_libraries(alta core ${PYTHON_LIBRARIES})
......@@ -228,6 +235,9 @@ if(PYTHONLIBS_FOUND AND PYBIND_FOUND)
if(APPLE)
set_target_properties(alta PROPERTIES SUFFIX ".so")
endif()
if(WIN32)
set_target_properties(alta PROPERTIES SUFFIX ".pyd")
endif()
endif()
......
......@@ -53,7 +53,7 @@ class ASTM : public vertical_segment
public: //methods
ASTM(const parameters& params, size_t size,
std::shared_ptr<double> input_data)
: vertical_segment(params, size, input_data)
: vertical_segment(params, size, input_data, vertical_segment::NO_CONFIDENCE_INTERVAL)
{ }
ASTM(const alta::parameters& params, size_t size)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment