From a1c66501891a8309281215bbb90254d24d3fa7d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20S=C3=A1nchez?= Date: Wed, 18 Mar 2015 13:26:09 +0100 Subject: [PATCH 1/3] biicode support added --- CMakeLists.txt | 13 +++++++++---- biicode.conf | 8 ++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 biicode.conf diff --git a/CMakeLists.txt b/CMakeLists.txt index 34e6bed..12acaa3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,14 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. +IF(BIICODE) + include(biicode/cmake/tools) + ADD_BIICODE_TARGETS() + ACTIVATE_CPP11(INTERFACE ${BII_BLOCK_TARGET}) +RETURN() + +ENDIF() + cmake_minimum_required(VERSION 2.6) project(cxxopts) @@ -36,7 +44,4 @@ if(CXXOPTS_USE_UNICODE_HELP) set(CXXOPTS_LINKER_LIBRARIES "${ICU_LIBRARIES}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCXXOPTS_USE_UNICODE") -endif() - -add_subdirectory(src) - +endif() \ No newline at end of file diff --git a/biicode.conf b/biicode.conf new file mode 100644 index 0000000..5794686 --- /dev/null +++ b/biicode.conf @@ -0,0 +1,8 @@ +# Biicode configuration file + +[requirements] + biicode/cmake: 3 + + +[parent] + david/cxxopts: 0 \ No newline at end of file From 507a3a6ec5d85b5807e6bb9d89b504e191216797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20S=C3=A1nchez=20Falero?= Date: Wed, 18 Mar 2015 17:31:29 +0100 Subject: [PATCH 2/3] Update CMakeLists.txt --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 12acaa3..219a714 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,4 +44,6 @@ if(CXXOPTS_USE_UNICODE_HELP) set(CXXOPTS_LINKER_LIBRARIES "${ICU_LIBRARIES}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCXXOPTS_USE_UNICODE") -endif() \ No newline at end of file +endif() + +add_subdirectory(src) From 732f4ec546310c3963a77f00d08250ef5b7b3c07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20S=C3=A1nchez=20Falero?= Date: Wed, 18 Mar 2015 17:33:01 +0100 Subject: [PATCH 3/3] Update biicode.conf --- biicode.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/biicode.conf b/biicode.conf index 5794686..f70f465 100644 --- a/biicode.conf +++ b/biicode.conf @@ -2,7 +2,3 @@ [requirements] biicode/cmake: 3 - - -[parent] - david/cxxopts: 0 \ No newline at end of file