Permalink
Browse files

remove Makefile

  • Loading branch information...
1 parent cfb9374 commit 0cf66dae73f78cea7e849a9254f19f5094f69957 @tokuhirom committed Jul 13, 2012
Showing with 9 additions and 2,455 deletions.
  1. +1 −0 .gitignore
  2. +8 −6 CMakeLists.txt
  3. +0 −2,449 Makefile
View
@@ -40,3 +40,4 @@ CMakeCache.txt
CMakeFiles/
cmake_install.cmake
install_manifest.txt
+Makefile
View
@@ -109,16 +109,18 @@ foreach(f ${TEST_CC_FILES})
TARGET_LINK_LIBRARIES("${_output}" "tora" ${libs} dl)
endforeach(f)
-# for src in glob("tests/test_*.cc"):
-# programs.append(env.NoClean(env.Program(src.rstrip(".cc") + '.t' + exe_suffix, [
-# libfiles,
-# src,
-# ])))
-
# test settings
ADD_CUSTOM_TARGET(test COMMAND "${PERL_EXECUTABLE}" util/test.pl DEPENDS tora)
+#############################################################################
+# installation settings
+#############################################################################
INSTALL(TARGETS libtora_a ARCHIVE DESTINATION lib)
INSTALL(TARGETS libtora_so LIBRARY DESTINATION lib)
INSTALL(TARGETS toraexe DESTINATION bin)
+#############################################################################
+# And libraries
+#############################################################################
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ext/Socket/)
+
Oops, something went wrong.

0 comments on commit 0cf66da

Please sign in to comment.