library is build by CMakeLists.txt in lib/cpp_utils and not by one under build

master
Denes Matetelki 12 years ago
parent 8dff446dd8
commit c081ce1f39

@ -1,7 +1,14 @@
cmake_minimum_required (VERSION 2.6)
project (CPP_UTILS_LIB)
add_subdirectory (build)
set(CMAKE_CXX_COMPILER "/usr/bin/g++-4.7")
set (CXX_FLAGS "-Wall -Wextra -pedantic -Weffc++ -Wshadow "
"-Wpointer-arith -Wcast-qual "
"-ggdb -fprofile-arcs -ftest-coverage -std=c++0x")
add_definitions( ${CXX_FLAGS} )
add_subdirectory (lib)
add_subdirectory (test EXCLUDE_FROM_ALL)
add_subdirectory (other EXCLUDE_FROM_ALL)

@ -1,19 +0,0 @@
cmake_minimum_required (VERSION 2.6)
project (CPP_UTILS_LIB)
set(CMAKE_CXX_COMPILER "/usr/lib/colorgcc/bin/g++")
set (CXX_FLAGS "-Wall -Wextra -pedantic -Weffc++ -Wshadow "
"-Wpointer-arith -Wcast-qual "
"-ggdb -fprofile-arcs -ftest-coverage -std=c++0x")
add_definitions( ${CXX_FLAGS} )
include_directories (../lib/cpp_utils/)
aux_source_directory(../lib/cpp_utils/ CPP_UTILS_LIB_SOURCES)
add_library (CppUtils SHARED ${CPP_UTILS_LIB_SOURCES})
add_library( mysqlclient SHARED IMPORTED )
set_target_properties( mysqlclient PROPERTIES IMPORTED_LOCATION /usr/lib/mysql/libmysqlclient.so )
target_link_libraries(CppUtils pthread rt gcov ssl mysqlclient)

@ -0,0 +1 @@
add_subdirectory (cpp_utils)

@ -0,0 +1,5 @@
include_directories (.)
aux_source_directory(. CPPUTILS_SOURCES)
add_library (CppUtils SHARED ${CPPUTILS_SOURCES})
target_link_libraries(CppUtils pthread rt gcov ssl mysqlclient)

@ -1,5 +1,5 @@
set(CMAKE_CXX_COMPILER "/usr/lib/colorgcc/bin/g++")
set(CMAKE_CXX_COMPILER "/usr/bin/g++-4.7")
set (CXX_FLAGS "-Wall -Wextra -pedantic -Weffc++ -Wshadow "
"-Wpointer-arith -Wcast-qual "

Loading…
Cancel
Save