Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis
Submodule .travis updated 1 files
+8 −2 dependencies/pybindgen-0.16
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ after_success:
- codecov --gcov-root=/tmp/_ci/build
after_failure: ./.travis/run after_failure
before_install:
# Avoid bug on CI with OSX, see https://github.com/travis-ci/travis-ci/issues/8552
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
- pip install --user codecov
- ./.travis/dependencies/eigen-${EIGEN_MAJOR}
- ./.travis/run before_install
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,5 @@ Available packages
[Eigen]: http://eigen.tuxfamily.org/
[Git]: http://git-scm.com/
[Libtool]: https://www.gnu.org/software/libtool/
[log4cxx]: https://logging.apache.org/log4cxx/
[pkg-config]: http://www.freedesktop.org/wiki/Software/pkg-config/
[RobotPkg]: http://robotpkg.openrobots.org/
56 changes: 56 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
version: 3.2-{branch}-{build}
branches:
only:
- master
- dev

configuration:
- Debug

platform:
- x64

# Disable automatic builds for now
build: off

os: Visual Studio 2015
clone_folder: C:\devel-src\roboptim-core-plugin-ipopt
environment:
CI_OS_NAME: win32
CI_TOOL: appveyor
# Dependencies should be a list of dependencies separated by spaces
CHOCO_DEPENDENCIES: "doxygen.portable"
GIT_DEPENDENCIES: "gergondet/ltdl-win32 roboptim/roboptim-core"
# Should be the same as clone_folder
PROJECT_SOURCE_DIR: C:\devel-src\roboptim-core-plugin-ipopt
# Do not tinker with the variables below unless you know what you are doing
SOURCE_FOLDER: C:\devel-src
CMAKE_INSTALL_PREFIX: C:/devel
PATH: C:/devel/bin;C:\Libraries\boost_1_60_0\lib64-msvc-14.0;C:\msys64\mingw64\bin;%PATH%
PKG_CONFIG_PATH: C:/devel/lib/pkgconfig
BOOST_ROOT: C:\Libraries\boost_1_60_0
BOOST_LIBRARYDIR: C:\Libraries\boost_1_60_0\lib64-msvc-14.0
MINGW_GFORTRAN: C:\msys64\mingw64\bin\gfortran.exe
# N.B: empty lines here and in test_script are VERY important
build_script:
- ps: >-
Set-PSDebug -Trace 2

iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/aescande/testAppveyor/master/installAsAppveyorDependency.ps1'))

git submodule update --init --recursive

. ./.travis/functions.ps1

setup_build

./.travis/dependencies/eigen-3.2.ps1

install_dependencies

build_project
test_script:
- cmd: >-
cd %PROJECT_SOURCE_DIR%/build

ctest --build-config %CONFIGURATION% --exclude-regex example
2 changes: 1 addition & 1 deletion cmake
3 changes: 0 additions & 3 deletions src/tnlp.hh
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,6 @@ namespace roboptim
Number obj_factor,
const Number* lambda);

/// \brief Pointer to function logger (see log4cxx documentation).
static log4cxx::LoggerPtr logger;

private:
/// \brief Non-linear function type.
///
Expand Down
4 changes: 0 additions & 4 deletions src/tnlp.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ namespace roboptim

namespace detail
{
template <typename T>
log4cxx::LoggerPtr Tnlp<T>::logger
(log4cxx::Logger::getLogger ("roboptim.ipopt"));

/// \internal
#ifdef ROBOPTIM_CORE_IPOPT_PLUGIN_CHECK_GRADIENT
template <typename T, typename F>
Expand Down
2 changes: 1 addition & 1 deletion tests/shared-tests
Submodule shared-tests updated 2 files
+0 −6 fixture.hh
+10 −4 tests.cmake