Mxx_ru 1.6.10.1 → 1.6.11

data/tests/cmake/main_app.cpp

@@ -0,0 +1,9 @@
+#include <hello_static.hpp>
+#include <hello_shared.hpp>
+
+int main()
+{
+  hello_static( "Hello, CMake World!" );
+  hello_shared( "Hello, CMake World!" );
+}
+

data/tests/cmake/main_app.rb

@@ -0,0 +1,15 @@
+require 'mxx_ru/cpp'
+
+MxxRu::Cpp::exe_target {
+  target 'main_app'
+  rtl_mode MxxRu::Cpp::RTL_SHARED
+
+  required_prj 'hello_static_cmake_wrapper.rb'
+  lib 'hello_static'
+
+  required_prj 'hello_shared_cmake_wrapper.rb'
+  lib 'hello_shared'
+
+  cpp_source 'main_app.cpp'
+}
+

data/tests/cmake/tc_cmake_build.rb

@@ -0,0 +1,29 @@
+require 'test/unit'
+
+require File.expand_path( File.dirname( __FILE__ ) + '/../test_with_compilation' )
+
+require File.expand_path( File.dirname( __FILE__ ) + '/../../lib/mxx_ru/externals.rb' )
+
+probe = MxxRu::Helpers.external_tool_version_probe(
+  'cmake --version', /^cmake version\s(\S+)\s/ )
+
+if probe
+  puts "CMake version #{probe}"
+
+  class TC_CMakeBuild < Test::Unit::TestCase
+    include TestWithCompilation
+
+    test_path 'tests/cmake'
+
+    test_case :successful_compile_and_link do
+      assert_nothing_raised {
+        build( 'build.rb' )
+        clean( 'build.rb' )
+      }
+    end
+
+  end
+else
+  puts "CMake not found, test skipped #{__FILE__}"
+end
+

data/tests/mxx_ru/vc8/tc_default_manifest.rb

@@ -5,7 +5,7 @@ require 'mxx_ru/cpp/toolsets/vc8'
 
 class TC_DefaultManifest < Test::Unit::TestCase
   def test_default
-    manifest_desc = Mxx_ru::Cpp::Toolsets::Vc8::default_manifest
+    manifest_desc = MxxRu::Cpp::Toolsets::Vc8::default_manifest
 
     assert_not_nil( manifest_desc )
     assert_equal( manifest_desc.autogen, true )

data/tests/mxx_ru/vc8/ts_vc8.rb

@@ -2,8 +2,8 @@ $:.unshift( File.dirname( __FILE__ ) )
 
 require 'test/unit'
 
-require 'tc_invalid_params'
 require 'tc_default_manifest'
+require 'tc_invalid_params'
 require 'tc_drop_default_manifest'
 require 'tc_define_manifest'
 require 'tc_actual_manifest'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Mxx_ru
 version: !ruby/object:Gem::Version
-  version: 1.6.10.1
+  version: 1.6.11
 platform: ruby
 authors:
 - The Mxx_ru Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies: []
 description: Mxx_ru is a cross-platform build tool primarily focused to C/C++ projects
 email: eao197@yahoo.com
@@ -81,6 +81,7 @@ files:
 - lib/mxx_ru/cpp/analyzer.rb
 - lib/mxx_ru/cpp/composite.rb
 - lib/mxx_ru/cpp/detect_toolset.rb
+- lib/mxx_ru/cpp/ext_cmake_project.rb
 - lib/mxx_ru/cpp/lib_collection.rb
 - lib/mxx_ru/cpp/mode.rb
 - lib/mxx_ru/cpp/obj_placement.rb
@@ -130,13 +131,30 @@ files:
 - lib/mxx_ru/generators/cpp-exe/g.rb
 - lib/mxx_ru/generators/cpp-lib-collection/g.rb
 - lib/mxx_ru/generators/cpp-lib/g.rb
+- lib/mxx_ru/generators/ext-cmake-prj/g.rb
+- lib/mxx_ru/generators/ext-cmake-prj/template.erb
+- lib/mxx_ru/generators/externals/g.rb
+- lib/mxx_ru/generators/externals/template.erb
 - lib/mxx_ru/generators/impl/cpp/generation.rb
 - lib/mxx_ru/generators/impl/cpp/template.erb
 - lib/mxx_ru/generators/impl/std_receiver.rb
+- lib/mxx_ru/helpers.rb
 - lib/mxx_ru/makestyle_generator.rb
 - lib/mxx_ru/textfile_unittest.rb
 - lib/mxx_ru/util.rb
 - lib/mxx_ru/version.rb
+- tests/cmake/build.rb
+- tests/cmake/hello_shared/CMakeLists.txt
+- tests/cmake/hello_shared/include/hello_shared.hpp
+- tests/cmake/hello_shared/src/hello_shared.cpp
+- tests/cmake/hello_shared_cmake_wrapper.rb
+- tests/cmake/hello_static/CMakeLists.txt
+- tests/cmake/hello_static/include/hello_static.hpp
+- tests/cmake/hello_static/src/hello_static.cpp
+- tests/cmake/hello_static_cmake_wrapper.rb
+- tests/cmake/main_app.cpp
+- tests/cmake/main_app.rb
+- tests/cmake/tc_cmake_build.rb
 - tests/cpp/cpp_sources_glob/build.rb
 - tests/cpp/cpp_sources_glob/some/module/1/f1.cpp
 - tests/cpp/cpp_sources_glob/some/module/2/f2.cpp