Menu
▾
▴
[Scstudio-commits] SF.net SVN: scstudio:[1554] trunk
|
From: <ma...@us...> - 2013-01-26 11:33:20
|
Revision: 1554
http://scstudio.svn.sourceforge.net/scstudio/?rev=1554&view=rev
Author: madzin
Date: 2013-01-26 11:33:09 +0000 (Sat, 26 Jan 2013)
Log Message:
-----------
Add boost library to cmakelist and remove generated makefile
Modified Paths:
--------------
trunk/CMakeLists.txt
Removed Paths:
-------------
trunk/third-party-sw/http_parser/Makefile
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2013-01-26 10:45:44 UTC (rev 1553)
+++ trunk/CMakeLists.txt 2013-01-26 11:33:09 UTC (rev 1554)
@@ -65,7 +65,7 @@
SET(Boost_USE_STATIC_LIBS OFF)
ENDIF(WIN32)
SET(Boost_USE_MULTITHREADED ON)
-FIND_PACKAGE(Boost COMPONENTS date_time thread serialization REQUIRED)
+FIND_PACKAGE(Boost COMPONENTS date_time thread serialization system REQUIRED)
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
FIND_PACKAGE(Java COMPONENTS Runtime)
Deleted: trunk/third-party-sw/http_parser/Makefile
===================================================================
--- trunk/third-party-sw/http_parser/Makefile 2013-01-26 10:45:44 UTC (rev 1553)
+++ trunk/third-party-sw/http_parser/Makefile 2013-01-26 11:33:09 UTC (rev 1554)
@@ -1,217 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 2.8
-
-# Default target executed when no arguments are given to make.
-default_target: all
-.PHONY : default_target
-
-#=============================================================================
-# Special targets provided by cmake.
-
-# Disable implicit rules so canonical targets will work.
-.SUFFIXES:
-
-# Remove some rules from gmake that .SUFFIXES does not remove.
-SUFFIXES =
-
-.SUFFIXES: .hpux_make_needs_suffix_list
-
-# Suppress display of executed commands.
-$(VERBOSE).SILENT:
-
-# A target that is always out of date.
-cmake_force:
-.PHONY : cmake_force
-
-#=============================================================================
-# Set environment variables for the build.
-
-# The shell in which to execute make rules.
-SHELL = /bin/sh
-
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
-
-# The command to remove a file.
-RM = /usr/bin/cmake -E remove -f
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/viktor/scstudio/trunk
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/viktor/scstudio/trunk
-
-#=============================================================================
-# Targets provided globally by CMake.
-
-# Special rule for the target edit_cache
-edit_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
- /usr/bin/cmake -i .
-.PHONY : edit_cache
-
-# Special rule for the target edit_cache
-edit_cache/fast: edit_cache
-.PHONY : edit_cache/fast
-
-# Special rule for the target install
-install: preinstall
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /usr/bin/cmake -P cmake_install.cmake
-.PHONY : install
-
-# Special rule for the target install
-install/fast: preinstall/fast
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /usr/bin/cmake -P cmake_install.cmake
-.PHONY : install/fast
-
-# Special rule for the target install/local
-install/local: preinstall
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
- /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
-
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
-
-# Special rule for the target install/strip
-install/strip: preinstall
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
- /usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
-.PHONY : install/strip
-
-# Special rule for the target install/strip
-install/strip/fast: install/strip
-.PHONY : install/strip/fast
-
-# Special rule for the target list_install_components
-list_install_components:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
-.PHONY : list_install_components
-
-# Special rule for the target list_install_components
-list_install_components/fast: list_install_components
-.PHONY : list_install_components/fast
-
-# Special rule for the target rebuild_cache
-rebuild_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
- /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
-# Special rule for the target test
-test:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
- /usr/bin/ctest --force-new-ctest-process $(ARGS)
-.PHONY : test
-
-# Special rule for the target test
-test/fast: test
-.PHONY : test/fast
-
-# The main all target
-all: cmake_check_build_system
- cd /home/viktor/scstudio/trunk && $(CMAKE_COMMAND) -E cmake_progress_start /home/viktor/scstudio/trunk/CMakeFiles /home/viktor/scstudio/trunk/third-party-sw/http_parser/CMakeFiles/progress.marks
- cd /home/viktor/scstudio/trunk && $(MAKE) -f CMakeFiles/Makefile2 third-party-sw/http_parser/all
- $(CMAKE_COMMAND) -E cmake_progress_start /home/viktor/scstudio/trunk/CMakeFiles 0
-.PHONY : all
-
-# The main clean target
-clean:
- cd /home/viktor/scstudio/trunk && $(MAKE) -f CMakeFiles/Makefile2 third-party-sw/http_parser/clean
-.PHONY : clean
-
-# The main clean target
-clean/fast: clean
-.PHONY : clean/fast
-
-# Prepare targets for installation.
-preinstall: all
- cd /home/viktor/scstudio/trunk && $(MAKE) -f CMakeFiles/Makefile2 third-party-sw/http_parser/preinstall
-.PHONY : preinstall
-
-# Prepare targets for installation.
-preinstall/fast:
- cd /home/viktor/scstudio/trunk && $(MAKE) -f CMakeFiles/Makefile2 third-party-sw/http_parser/preinstall
-.PHONY : preinstall/fast
-
-# clear depends
-depend:
- cd /home/viktor/scstudio/trunk && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
-.PHONY : depend
-
-# Convenience name for target.
-third-party-sw/http_parser/CMakeFiles/http_parser.dir/rule:
- cd /home/viktor/scstudio/trunk && $(MAKE) -f CMakeFiles/Makefile2 third-party-sw/http_parser/CMakeFiles/http_parser.dir/rule
-.PHONY : third-party-sw/http_parser/CMakeFiles/http_parser.dir/rule
-
-# Convenience name for target.
-http_parser: third-party-sw/http_parser/CMakeFiles/http_parser.dir/rule
-.PHONY : http_parser
-
-# fast build rule for target.
-http_parser/fast:
- cd /home/viktor/scstudio/trunk && $(MAKE) -f third-party-sw/http_parser/CMakeFiles/http_parser.dir/build.make third-party-sw/http_parser/CMakeFiles/http_parser.dir/build
-.PHONY : http_parser/fast
-
-http_parser.o: http_parser.c.o
-.PHONY : http_parser.o
-
-# target to build an object file
-http_parser.c.o:
- cd /home/viktor/scstudio/trunk && $(MAKE) -f third-party-sw/http_parser/CMakeFiles/http_parser.dir/build.make third-party-sw/http_parser/CMakeFiles/http_parser.dir/http_parser.c.o
-.PHONY : http_parser.c.o
-
-http_parser.i: http_parser.c.i
-.PHONY : http_parser.i
-
-# target to preprocess a source file
-http_parser.c.i:
- cd /home/viktor/scstudio/trunk && $(MAKE) -f third-party-sw/http_parser/CMakeFiles/http_parser.dir/build.make third-party-sw/http_parser/CMakeFiles/http_parser.dir/http_parser.c.i
-.PHONY : http_parser.c.i
-
-http_parser.s: http_parser.c.s
-.PHONY : http_parser.s
-
-# target to generate assembly for a file
-http_parser.c.s:
- cd /home/viktor/scstudio/trunk && $(MAKE) -f third-party-sw/http_parser/CMakeFiles/http_parser.dir/build.make third-party-sw/http_parser/CMakeFiles/http_parser.dir/http_parser.c.s
-.PHONY : http_parser.c.s
-
-# Help Target
-help:
- @echo "The following are some of the valid targets for this Makefile:"
- @echo "... all (the default if no target is provided)"
- @echo "... clean"
- @echo "... depend"
- @echo "... edit_cache"
- @echo "... http_parser"
- @echo "... install"
- @echo "... install/local"
- @echo "... install/strip"
- @echo "... list_install_components"
- @echo "... rebuild_cache"
- @echo "... test"
- @echo "... http_parser.o"
- @echo "... http_parser.i"
- @echo "... http_parser.s"
-.PHONY : help
-
-
-
-#=============================================================================
-# Special targets to cleanup operation of make.
-
-# Special rule to run CMake to check the build system integrity.
-# No rule that depends on this can have commands that come from listfiles
-# because they might be regenerated.
-cmake_check_build_system:
- cd /home/viktor/scstudio/trunk && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
-.PHONY : cmake_check_build_system
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
