emplace 0.1.10 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3567a24a0760d2133c5ce75a69c537cf5c1eec53
-  data.tar.gz: c753976c2449fe2037af1b8288f2f6fe5ba96b63
+  metadata.gz: f74a6856d8982edf301a6212c529d95d52d21a14
+  data.tar.gz: 0f3d59b63618dffc8c067510a390d43c03768e0d
 SHA512:
-  metadata.gz: 8292a5c65143442061c77720af3aee7f5e7cb90a0104224b85f838027716ead77ad8d895f2af43f8ad945b7bb9c16b53d2d1a2ccc9d20957d16f7b254367a3c7
-  data.tar.gz: 3b395ecce0bf7010376e7aa52d66a8b77b195831ae408d27238b7f77b17fafbfd239c49bda324466209084daf9b6ae7de70bbcb5464eaff91890e0714cd43144
+  metadata.gz: a6ed5830a0f40b955c0af05c870590e20e9778aa5f42ebc60b8f838cacb70d3b01be599a7d0d4fd27255edf75394a02e0204304212e455c26ad918719fe764e8
+  data.tar.gz: 88c87d4307828f0fd6dc4ca5462d125620b2899c056bcf1cbf8477cf005eea86903a1355087728a693eeda7cf00e23bd5ec8171d2ea748e24a735bee06b5f6a3

data/README.md

@@ -18,7 +18,7 @@ Or install it yourself as:
 
     $ gem install emplace
 
-## Usage
+## Rakefile Usage
 
 	require 'emplace'
 	project = Emplace.new 'project-name'
@@ -27,6 +27,12 @@ Or install it yourself as:
 	project.test!
 	project.package!
 
+## CMake Macros
+
+	include(Emplace)
+
+	install_symbols(<target> [STATIC] DESTINATION <directory>)
+
 ## Contributing
 
 1. Fork it

data/lib/emplace.rb

@@ -7,6 +7,9 @@ module Emplace
       @name = name
       @impl = impl
     end
+    def module_dir
+      File.join(File.dirname(File.dirname(__FILE__)), 'modules')
+    end
     def build_dir
       'build'
     end
@@ -22,7 +25,7 @@ module Emplace
       FileUtils.rm_rf vendor_dir
     end
     def cmake!
-      @impl.cmake @name, build_dir, dist_dir
+      @impl.cmake @name, module_dir, build_dir, dist_dir
     end
     def build!
       @impl.build build_dir
@@ -48,8 +51,8 @@ module Emplace
   end
 
   class CMakeBuild
-    def cmake(name, build_dir, dist_dir)
-      sh "cmake . -B#{build_dir} -DCMAKE_INSTALL_PREFIX=#{dist_dir}/#{name} -G \"#{cmake_generator}\""
+    def cmake(name, module_dir, build_dir, dist_dir)
+      sh "cmake . -B#{build_dir} -DCMAKE_MODULE_PATH=#{module_dir} -DCMAKE_INSTALL_PREFIX=#{dist_dir}/#{name} -G \"#{cmake_generator}\""
     end
     def build(dir)
       sh "cmake --build #{dir} --target install"

data/modules/Emplace.cmake

@@ -0,0 +1,17 @@
+include(CMakeParseArguments)
+
+if(UNIX)
+	include(unix/Emplace)
+elseif(WIN32)
+	include(win32/Emplace)
+endif()
+
+macro(install_symbols)
+	cmake_parse_arguments(install_args "STATIC" "DESTINATION" "TARGETS" ${ARGN})
+
+	foreach(target ${install_args_TARGETS})
+		if(${install_args_STATIC} STREQUAL "TRUE")
+			_install_static_lib_symbols(${target} ${install_args_DESTINATION})
+		endif()
+	endforeach()
+endmacro()

data/modules/unix/Emplace.cmake

@@ -0,0 +1,13 @@
+#  Unix global definitions
+
+set(warning_flags "-Werror=return-type -Wno-unused-local-typedefs")
+if(APPLE)
+	set(warning_flags "${warning_flags} -Wno-overloaded-virtual")
+endif()
+
+set(CMAKE_CXX_FLAGS "-Wall -fPIC -fno-omit-frame-pointer -fno-strict-aliasing -g -O2 ${warning_flags}")
+set(CMAKE_C_FLAGS "-Wall -fPIC -fno-omit-frame-pointer -fno-strict-aliasing -g -O2 ${warning_flags}")
+
+macro(_install_static_lib_symbols proj dir)
+	# nothing to do
+endmacro()

data/modules/win32/Emplace.cmake

@@ -0,0 +1,14 @@
+# Windows MSVC global definitions
+
+string(REGEX REPLACE "/STACK:[0-9]+" "" CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
+set(CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /EHsc /GR")
+set(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1")
+set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1")
+
+macro(_install_static_lib_symbols proj dir)
+	install(
+		FILES "${CMAKE_CURRENT_BINARY_DIR}/$(IntDir)${proj}.pdb"
+		DESTINATION symbols
+		OPTIONAL
+	)
+endmacro()

data/test/emplace-test.rb

@@ -65,7 +65,7 @@ class TestEmplace < Test::Unit::TestCase
 
     travis = Travis.new
     project = Emplace::Project.new 'foo', travis
-    project.fetch! 'url_source_dir'
+    project.fetch! "file://#{FileUtils.pwd}/url_source_dir"
 
     assert_equal 'foo', File.read('vendor/foo-linux-x86_64-cc.tgz')
   ensure
@@ -81,7 +81,7 @@ class TestEmplace < Test::Unit::TestCase
 
     appveyor = AppVeyor.new
     project = Emplace::Project.new 'foo', appveyor
-    project.fetch! 'url_source_dir'
+    project.fetch! "file://#{FileUtils.pwd}/url_source_dir"
 
     assert_equal 'foo', File.read('vendor/foo-win-x64-msvc-cfg.zip')
   ensure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emplace
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryan Calhoun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-19 00:00:00.000000000 Z
+date: 2016-03-12 00:00:00.000000000 Z
 dependencies: []
 description: Keeps settings for running cmake builds on Travis-CI and AppVeyor.
 email:
@@ -21,6 +21,9 @@ files:
 - README.md
 - Rakefile
 - lib/emplace.rb
+- modules/Emplace.cmake
+- modules/unix/Emplace.cmake
+- modules/win32/Emplace.cmake
 - test/emplace-test.rb
 homepage: https://github.com/ryancalhoun/emplace
 licenses: