Skip to content

Commit

Permalink
bringing in updated emplace gem to simplify cmake buildfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
ryancalhoun committed Dec 17, 2015
1 parent 2506b2e commit bd4c8c8
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 17 deletions.
7 changes: 0 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
CMakeCache.txt
CMakeFiles/
CTestTestfile.cmake
Makefile
Testing
build/
dist/
cmake_install.cmake
install_manifest.txt

6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/include
)

add_subdirectory(src/cppunit build/src/cppunit)
add_subdirectory(test build/test)
add_subdirectory(src/cppunit)
add_subdirectory(test)

install(DIRECTORY include/ DESTINATION ${CMAKE_SOURCE_DIR}/dist/cppunit/include)
install(DIRECTORY include/ DESTINATION include)
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
emplace (0.1.2)
emplace (0.1.4)

PLATFORMS
ruby
Expand Down
10 changes: 5 additions & 5 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
require 'rake/testtask'
require 'emplace'

project = Emplace::Project.new 'cppunit'

task :clean do
rm_rf 'build'
rm_rf 'dist'
end

task :cmake do
Emplace.cmake
project.cmake!
end

task :build do
Emplace.build
project.build!
end

task :package do
chdir('dist') do
Emplace.package('cppunit')
end
project.package!
end

Rake::TestTask.new {|t|
Expand Down
2 changes: 1 addition & 1 deletion src/cppunit/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,6 @@ include_directories(
)

add_library(cppunit STATIC ${SOURCES})
install(TARGETS cppunit ARCHIVE DESTINATION ${CMAKE_SOURCE_DIR}/dist/cppunit/lib)
install(TARGETS cppunit ARCHIVE DESTINATION lib)


0 comments on commit bd4c8c8

Please sign in to comment.