From 25074512ff9f683c6a228aa979d0ccd207b8d1a9 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 5 Feb 2014 20:38:57 +0100 Subject: [PATCH] Cmake edit with 'make install' target --- CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 512073bc..1bef366c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,10 +3,6 @@ project (benchmark) find_package(Threads) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin) -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib) -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib) - set(CMAKE_CXX_FLAGS "-Wall -Werror -pedantic-errors --std=c++0x") set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -DDEBUG") set(CMAKE_CXX_FLAGS_RELEASE "-fno-strict-aliasing -O3 -DNDEBUG") @@ -32,7 +28,6 @@ endif() # Set up directories include_directories(${PROJECT_SOURCE_DIR}/include) include_directories(${PROJECT_SOURCE_DIR}/src) -link_directories(${PROJECT_SOURCE_DIR}/lib) # Build the targets FILE(GLOB SOURCE_FILES "src/*.cc") @@ -41,3 +36,9 @@ add_library(benchmark STATIC ${SOURCE_FILES}) add_executable(benchmark_test test/benchmark_test.cc) target_link_libraries(benchmark_test benchmark ${CMAKE_THREAD_LIBS_INIT}) +# Install target (will install the library to specified CMAKE_INSTALL_PREFIX variable) +INSTALL( + TARGETS benchmark + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + COMPONENT library) \ No newline at end of file