Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to cmake #49

Merged
merged 29 commits into from
Jul 11, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
6bec09f
cmake: set default Release build type
jschueller Sep 4, 2015
ec83297
cmake: optionally enable cxx
jschueller Sep 4, 2015
087d93e
cmake: enable bindings with static library
jschueller Sep 4, 2015
b565b8c
cmake: build testopt
jschueller Sep 4, 2015
06c6b0a
cmake: enable cxx for python bindings
jschueller Sep 4, 2015
bc3e562
cmake: install nlopt.pc
jschueller Sep 4, 2015
46075ce
cmake: added missing compiler checks
jschueller Sep 4, 2015
06984ff
cmake: add octave support
jschueller Sep 4, 2015
599ad7b
cmake: add guile bindings
jschueller Sep 4, 2015
0c2298c
cmake: provide package_source target
jschueller Sep 5, 2015
d9e38ea
cmake: generate api headers
jschueller Sep 5, 2015
c0252ad
Add Appveyor config file
jschueller Jul 5, 2016
f377e07
Test MinGW build
jschueller Jul 5, 2016
0219a2e
Removed autotools
jschueller Jul 5, 2016
743d581
cmake: install man
jschueller Jul 5, 2016
8f9f988
re-implement getopt for test
jschueller Jul 5, 2016
e908b5c
travis: +osx
jschueller Jul 5, 2016
43951cb
cmake: man/pkgconfig unix only
jschueller Jul 5, 2016
0c64230
add only Python test if built
jschueller Jul 5, 2016
2dad3ff
cmake: pkgconfig on mingw
jschueller Jul 5, 2016
4eec9de
Fix octave include
jschueller Jul 5, 2016
6e7efd6
Find numpy includes
jschueller Jul 5, 2016
9bcc6a4
Detect SWIG at top-level
jschueller Jul 5, 2016
d9de590
cmake: RPATH policy
jschueller Jul 5, 2016
901abca
appveyor: shared build
jschueller Jul 6, 2016
77cea18
Add cmake config files
jschueller Jul 9, 2016
547f3a3
travis: shared builds
jschueller Jul 6, 2016
a9da882
appveyor: no shared builds
jschueller Jul 6, 2016
5b02e52
BUILD-MINGWXX.sh are superseeded by toolchain files
jschueller Jul 6, 2016
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
26 changes: 1 addition & 25 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*.mex*
*.oct
*.zip
build

# generated code
api/nlopt.f
Expand All @@ -30,28 +31,3 @@ mingw64
octave/dummy
test/testopt
util/redblack_test

# autotools stuff
Makefile
Makefile.in
.deps
.libs
stamp-h1
install-sh
libtool
ltmain.sh
m4/libtool.m4
m4/ltoptions.m4
m4/ltsugar.m4
m4/ltversion.m4
m4/lt~obsolete.m4
configure
config.*
autom4te.cache
INSTALL
README
aclocal.m4
depcomp
missing
py-compile
compile
56 changes: 36 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,40 @@
language: cpp
sudo: false

addons:
apt:
packages:
- swig
- python-dev
- python-numpy
- guile-2.0-dev
- octave3.2-headers
- cmake
matrix:
include:
- os: linux
addons:
apt:
packages:
- swig
- python-dev
- python-numpy
- guile-2.0-dev
- octave3.2-headers
- cmake
- g++-mingw-w64-i686
- gcc-mingw-w64-i686
- binutils-mingw-w64-i686
- g++-mingw-w64-x86-64
- gcc-mingw-w64-x86-64
- binutils-mingw-w64-x86-64
script:
- mkdir build && pushd build
- cmake -DCMAKE_INSTALL_PREFIX=~/.local -DWITH_CXX=ON ..
- make install -j2 && make tests -j2 && ctest -j2 --output-on-failure
- rm -rf * ~/.local
- cmake -DCMAKE_INSTALL_PREFIX=~/.local -DWITH_CXX=ON -DBUILD_PYTHON=OFF -DBUILD_OCTAVE=OFF -DBUILD_GUILE=OFF -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/toolchain-i686-w64-mingw32.cmake ..
- make install -j2 && make tests -j2
- rm -rf * ~/.local
- cmake -DCMAKE_INSTALL_PREFIX=~/.local -DWITH_CXX=ON -DBUILD_PYTHON=OFF -DBUILD_OCTAVE=OFF -DBUILD_GUILE=OFF -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/toolchain-x86_64-w64-mingw32.cmake ..
- make install -j2 && make tests -j2

script:
- ./autogen.sh --no-configure
- mkdir build && pushd build
- ../configure --prefix=$HOME/.local --enable-shared --enable-maintainer-mode --enable-cxx
- make -j2
- make install
- python ../test/test_std.py
- rm -rf * ~/.local
- cmake -DCMAKE_INSTALL_PREFIX=~/.local -DBUILD_SHARED_LIBS=ON ..
- make install -j2
- python ../test/test_std.py
- os: osx
install:
- brew tap homebrew/python
- brew install swig python
script:
- mkdir build && pushd build
- cmake -DCMAKE_INSTALL_PREFIX=~/.local -DWITH_CXX=ON ..
- make install && make tests && ctest --output-on-failure
85 changes: 0 additions & 85 deletions BUILD-MINGW32.sh

This file was deleted.

85 changes: 0 additions & 85 deletions BUILD-MINGW64.sh

This file was deleted.

Loading