diff options
Diffstat (limited to '')
| -rw-r--r-- | common.cmake (renamed from cmake/common.cmake) | 0 | ||||
| -rw-r--r-- | examples/boost/CMakeLists.txt (renamed from cmake/examples/boost/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | examples/boost/foo.cpp (renamed from cmake/examples/boost/foo.cpp) | 0 | ||||
| -rw-r--r-- | examples/dynamic/CMakeLists.txt (renamed from cmake/examples/dynamic/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | examples/dynamic/baz.cpp (renamed from cmake/examples/dynamic/baz.cpp) | 0 | ||||
| -rw-r--r-- | examples/dynamic/baz.hpp (renamed from cmake/examples/dynamic/baz.hpp) | 0 | ||||
| -rw-r--r-- | examples/dynamic/foo.cpp (renamed from cmake/examples/dynamic/foo.cpp) | 0 | ||||
| -rw-r--r-- | examples/simple/CMakeLists.txt (renamed from cmake/examples/simple/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | examples/simple/foo.cpp (renamed from cmake/examples/simple/foo.cpp) | 0 | ||||
| -rw-r--r-- | examples/static/CMakeLists.txt (renamed from cmake/examples/static/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | examples/static/bar.cpp (renamed from cmake/examples/static/bar.cpp) | 0 | ||||
| -rw-r--r-- | examples/static/bar.hpp (renamed from cmake/examples/static/bar.hpp) | 0 | ||||
| -rw-r--r-- | examples/static/foo.cpp (renamed from cmake/examples/static/foo.cpp) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | project/ci/appveyor/cmake.py (renamed from cmake/build/ci/appveyor.py) | 7 | ||||
| -rw-r--r--[-rwxr-xr-x] | project/ci/travis/cmake.py (renamed from cmake/build/ci/travis.py) | 7 | ||||
| -rw-r--r-- | project/cmake/README.md (renamed from cmake/build/README.md) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | project/cmake/build.py (renamed from cmake/build/build.py) | 0 | ||||
| -rw-r--r-- | toolchains/cmake/README.md (renamed from cmake/toolchains/README.md) | 0 | ||||
| -rw-r--r-- | toolchains/cmake/gcc-x64.cmake (renamed from cmake/toolchains/gcc-x64.cmake) | 0 | ||||
| -rw-r--r-- | toolchains/cmake/gcc-x86.cmake (renamed from cmake/toolchains/gcc-x86.cmake) | 0 | ||||
| -rw-r--r-- | toolchains/cmake/mingw-w64-x64.cmake (renamed from cmake/toolchains/mingw-w64-x64.cmake) | 0 | ||||
| -rw-r--r-- | toolchains/cmake/mingw-w64-x86.cmake (renamed from cmake/toolchains/mingw-w64-x86.cmake) | 0 |
22 files changed, 4 insertions, 10 deletions
diff --git a/cmake/common.cmake b/common.cmake index 0d813fe..0d813fe 100644 --- a/cmake/common.cmake +++ b/common.cmake diff --git a/cmake/examples/boost/CMakeLists.txt b/examples/boost/CMakeLists.txt index 8c076c9..8c076c9 100644 --- a/cmake/examples/boost/CMakeLists.txt +++ b/examples/boost/CMakeLists.txt diff --git a/cmake/examples/boost/foo.cpp b/examples/boost/foo.cpp index 3bd0326..3bd0326 100644 --- a/cmake/examples/boost/foo.cpp +++ b/examples/boost/foo.cpp diff --git a/cmake/examples/dynamic/CMakeLists.txt b/examples/dynamic/CMakeLists.txt index 4602adb..4602adb 100644 --- a/cmake/examples/dynamic/CMakeLists.txt +++ b/examples/dynamic/CMakeLists.txt diff --git a/cmake/examples/dynamic/baz.cpp b/examples/dynamic/baz.cpp index d108ae3..d108ae3 100644 --- a/cmake/examples/dynamic/baz.cpp +++ b/examples/dynamic/baz.cpp diff --git a/cmake/examples/dynamic/baz.hpp b/examples/dynamic/baz.hpp index 2fc9b2a..2fc9b2a 100644 --- a/cmake/examples/dynamic/baz.hpp +++ b/examples/dynamic/baz.hpp diff --git a/cmake/examples/dynamic/foo.cpp b/examples/dynamic/foo.cpp index b7d9986..b7d9986 100644 --- a/cmake/examples/dynamic/foo.cpp +++ b/examples/dynamic/foo.cpp diff --git a/cmake/examples/simple/CMakeLists.txt b/examples/simple/CMakeLists.txt index 4f8859e..4f8859e 100644 --- a/cmake/examples/simple/CMakeLists.txt +++ b/examples/simple/CMakeLists.txt diff --git a/cmake/examples/simple/foo.cpp b/examples/simple/foo.cpp index b9d3132..b9d3132 100644 --- a/cmake/examples/simple/foo.cpp +++ b/examples/simple/foo.cpp diff --git a/cmake/examples/static/CMakeLists.txt b/examples/static/CMakeLists.txt index 8a6acb8..8a6acb8 100644 --- a/cmake/examples/static/CMakeLists.txt +++ b/examples/static/CMakeLists.txt diff --git a/cmake/examples/static/bar.cpp b/examples/static/bar.cpp index 37aa9b5..37aa9b5 100644 --- a/cmake/examples/static/bar.cpp +++ b/examples/static/bar.cpp diff --git a/cmake/examples/static/bar.hpp b/examples/static/bar.hpp index a3ea4c1..a3ea4c1 100644 --- a/cmake/examples/static/bar.hpp +++ b/examples/static/bar.hpp diff --git a/cmake/examples/static/foo.cpp b/examples/static/foo.cpp index c6355a2..c6355a2 100644 --- a/cmake/examples/static/foo.cpp +++ b/examples/static/foo.cpp diff --git a/cmake/build/ci/appveyor.py b/project/ci/appveyor/cmake.py index b9141ec..e1ebce0 100755..100644 --- a/cmake/build/ci/appveyor.py +++ b/project/ci/appveyor/cmake.py @@ -19,6 +19,8 @@ import logging import os import sys +from project.cmake.build import build + class Image(Enum): VS_2013 = 'Visual Studio 2013' @@ -132,11 +134,6 @@ def build_appveyor(argv=None): args = _parse_args(argv) _check_appveyor() - this_module_dir = os.path.dirname(os.path.abspath(__file__)) - parent_module_dir = os.path.dirname(this_module_dir) - sys.path.insert(1, parent_module_dir) - from build import build - appveyor_argv = [ '--build', _get_build_dir(), '--configuration', _get_configuration(), diff --git a/cmake/build/ci/travis.py b/project/ci/travis/cmake.py index ab93711..7a1f707 100755..100644 --- a/cmake/build/ci/travis.py +++ b/project/ci/travis/cmake.py @@ -19,6 +19,8 @@ import os import os.path import sys +from project.cmake.build import build + def _env(name): if name not in os.environ: @@ -69,11 +71,6 @@ def build_travis(argv=None): args = _parse_args(argv) _check_travis() - this_module_dir = os.path.dirname(os.path.abspath(__file__)) - parent_module_dir = os.path.dirname(this_module_dir) - sys.path.insert(1, parent_module_dir) - from build import build - travis_argv = [ '--build', _get_build_dir(), '--configuration', _get_configuration(), diff --git a/cmake/build/README.md b/project/cmake/README.md index b63564d..b63564d 100644 --- a/cmake/build/README.md +++ b/project/cmake/README.md diff --git a/cmake/build/build.py b/project/cmake/build.py index 695489b..695489b 100755..100644 --- a/cmake/build/build.py +++ b/project/cmake/build.py diff --git a/cmake/toolchains/README.md b/toolchains/cmake/README.md index 9c58eb6..9c58eb6 100644 --- a/cmake/toolchains/README.md +++ b/toolchains/cmake/README.md diff --git a/cmake/toolchains/gcc-x64.cmake b/toolchains/cmake/gcc-x64.cmake index 2f7019e..2f7019e 100644 --- a/cmake/toolchains/gcc-x64.cmake +++ b/toolchains/cmake/gcc-x64.cmake diff --git a/cmake/toolchains/gcc-x86.cmake b/toolchains/cmake/gcc-x86.cmake index e2e84be..e2e84be 100644 --- a/cmake/toolchains/gcc-x86.cmake +++ b/toolchains/cmake/gcc-x86.cmake diff --git a/cmake/toolchains/mingw-w64-x64.cmake b/toolchains/cmake/mingw-w64-x64.cmake index c689d39..c689d39 100644 --- a/cmake/toolchains/mingw-w64-x64.cmake +++ b/toolchains/cmake/mingw-w64-x64.cmake diff --git a/cmake/toolchains/mingw-w64-x86.cmake b/toolchains/cmake/mingw-w64-x86.cmake index e5dedd4..e5dedd4 100644 --- a/cmake/toolchains/mingw-w64-x86.cmake +++ b/toolchains/cmake/mingw-w64-x86.cmake |