Add cmake support (#2)

* add cmake support * fix include and lib paths
mpmilano · Apr 7, 2019 · 6374730 · 6374730
1 parent aaba04f
commit 6374730
Show file tree

Hide file tree

Showing 34 changed files with 62 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,56 @@
+cmake_minimum_required (VERSION 3.1)
+project (mutils-tasks)
+
+#Versions
+set(mutils_tasks_VERSION 1.0)
+
+#CXX FLAGS
+set(CMAKE_CXX_FLAGS "-std=c++14 -fPIC -DMAX_THREADS=10000")
+set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS})
+set(CMAKE_CXX_FLAGS_DEBUG "-std=c++14 -fPIC -DMAX_THREADS=10000 -g")
+set(CMAKE_SHARED_LINKER_FLAGS "-shared --enable-new-dtags")
+
+#Check dependencies
+find_package(mutils 1.0)
+if(NOT ${mutils_FOUND})
+  message( FATAL_ERROR "mutils not found.")
+endif(NOT ${mutils_FOUND})
+
+add_library(mutils-tasks SHARED FutureFreePool.cpp GlobalPool.cpp)
+target_include_directories(mutils-tasks PRIVATE
+  $<BUILD_INTERFACE:${mutils-tasks_SOURCE_DIR}/include>)
+
+#Make install
+install(TARGETS mutils-tasks EXPORT mutils-tasks
+        LIBRARY DESTINATION lib)
+install(DIRECTORY include/mutils-tasks
+        DESTINATION include)
+
+include(CMakePackageConfigHelpers)
+write_basic_package_version_file(
+  "${CMAKE_CURRENT_BINARY_DIR}/mutils-tasks/mutils-tasksConfigVersion.cmake"
+  VERSION ${mutils_tasks_VERSION}
+  COMPATIBILITY AnyNewerVersion
+)
+
+export (EXPORT mutils-tasks
+  FILE "${CMAKE_CURRENT_BINARY_DIR}/mutils-tasks/mutils-tasksTargets.cmake"
+)
+
+configure_file (mutils-tasksConfig.cmake
+  "${CMAKE_CURRENT_BINARY_DIR}/mutils-tasks/mutils-tasksConfig.cmake"
+  COPYONLY
+)
+
+set(ConfigPackageLocation lib/cmake/mutils-tasks)
+install(EXPORT mutils-tasks
+  FILE mutils-tasksTargets.cmake
+  DESTINATION ${ConfigPackageLocation}
+)
+
+install(
+  FILES
+    mutils-tasksConfig.cmake
+    "${CMAKE_CURRENT_BINARY_DIR}/mutils-tasks/mutils-tasksConfigVersion.cmake"
+  DESTINATION ${ConfigPackageLocation}
+)
diff --git a/FutureFreePool.cpp b/FutureFreePool.cpp
@@ -1,7 +1,7 @@
-#include "FutureFreePool.hpp"
-#include "GlobalPool.hpp"
+#include "mutils-tasks/FutureFreePool.hpp"
+#include "mutils-tasks/GlobalPool.hpp"
 #include <list>
-#include "../mutils/AtScopeEnd.hpp"
+#include "mutils/AtScopeEnd.hpp"
 
 using namespace std;
 

diff --git a/GlobalPool.cpp b/GlobalPool.cpp
@@ -1,3 +1,3 @@
-#include "GlobalPool.hpp"
+#include "mutils-tasks/GlobalPool.hpp"
 
 GlobalPool  GlobalPool::inst;
diff --git a/FutureFreePool.hpp → include/mutils-tasks/FutureFreePool.hpp b/FutureFreePool.hpp → include/mutils-tasks/FutureFreePool.hpp
diff --git a/GlobalPool.hpp → include/mutils-tasks/GlobalPool.hpp b/GlobalPool.hpp → include/mutils-tasks/GlobalPool.hpp
diff --git a/GloballyBackedExecutor.hpp → ...e/mutils-tasks/GloballyBackedExecutor.hpp b/GloballyBackedExecutor.hpp → ...e/mutils-tasks/GloballyBackedExecutor.hpp
diff --git a/TaskPool.hpp → include/mutils-tasks/TaskPool.hpp b/TaskPool.hpp → include/mutils-tasks/TaskPool.hpp
diff --git a/abortable_lock.hpp → include/mutils-tasks/abortable_lock.hpp b/abortable_lock.hpp → include/mutils-tasks/abortable_lock.hpp
diff --git a/better_cv.hpp → include/mutils-tasks/better_cv.hpp b/better_cv.hpp → include/mutils-tasks/better_cv.hpp
diff --git a/blockingconcurrentqueue.h → ...de/mutils-tasks/blockingconcurrentqueue.h b/blockingconcurrentqueue.h → ...de/mutils-tasks/blockingconcurrentqueue.h
diff --git a/concurrentqueue.h → include/mutils-tasks/concurrentqueue.h b/concurrentqueue.h → include/mutils-tasks/concurrentqueue.h
diff --git a/ctpl_stl.h → include/mutils-tasks/ctpl_stl.h b/ctpl_stl.h → include/mutils-tasks/ctpl_stl.h
diff --git a/delay_thread.hpp → include/mutils-tasks/delay_thread.hpp b/delay_thread.hpp → include/mutils-tasks/delay_thread.hpp
diff --git a/eventfd.hpp → include/mutils-tasks/eventfd.hpp b/eventfd.hpp → include/mutils-tasks/eventfd.hpp
diff --git a/resource_pool.hpp → include/mutils-tasks/resource_pool.hpp b/resource_pool.hpp → include/mutils-tasks/resource_pool.hpp
diff --git a/resource_pool_LockedResource.hpp → ...ls-tasks/resource_pool_LockedResource.hpp b/resource_pool_LockedResource.hpp → ...ls-tasks/resource_pool_LockedResource.hpp
diff --git a/resource_pool_WeakResource.hpp → ...tils-tasks/resource_pool_WeakResource.hpp b/resource_pool_WeakResource.hpp → ...tils-tasks/resource_pool_WeakResource.hpp
diff --git a/resource_pool_declarations.hpp → ...tils-tasks/resource_pool_declarations.hpp b/resource_pool_declarations.hpp → ...tils-tasks/resource_pool_declarations.hpp
diff --git a/resource_pool_impl.hpp → include/mutils-tasks/resource_pool_impl.hpp b/resource_pool_impl.hpp → include/mutils-tasks/resource_pool_impl.hpp
diff --git a/resource_pool_impl_index_owner.hpp → ...-tasks/resource_pool_impl_index_owner.hpp b/resource_pool_impl_index_owner.hpp → ...-tasks/resource_pool_impl_index_owner.hpp
diff --git a/resource_pool_impl_locked_resource.hpp → ...ks/resource_pool_impl_locked_resource.hpp b/resource_pool_impl_locked_resource.hpp → ...ks/resource_pool_impl_locked_resource.hpp
diff --git a/resource_pool_impl_overdrawn_resource.hpp → ...resource_pool_impl_overdrawn_resource.hpp b/resource_pool_impl_overdrawn_resource.hpp → ...resource_pool_impl_overdrawn_resource.hpp
diff --git a/resource_pool_impl_resource.hpp → ...ils-tasks/resource_pool_impl_resource.hpp b/resource_pool_impl_resource.hpp → ...ils-tasks/resource_pool_impl_resource.hpp
diff --git a/resource_pool_impl_resource_pack.hpp → ...asks/resource_pool_impl_resource_pack.hpp b/resource_pool_impl_resource_pack.hpp → ...asks/resource_pool_impl_resource_pack.hpp
diff --git a/resource_pool_impl_resource_pool.hpp → ...asks/resource_pool_impl_resource_pool.hpp b/resource_pool_impl_resource_pool.hpp → ...asks/resource_pool_impl_resource_pool.hpp
diff --git a/resource_pool_impl_spare_resource.hpp → ...sks/resource_pool_impl_spare_resource.hpp b/resource_pool_impl_spare_resource.hpp → ...sks/resource_pool_impl_spare_resource.hpp
diff --git a/resource_pool_impl_state.hpp → ...mutils-tasks/resource_pool_impl_state.hpp b/resource_pool_impl_state.hpp → ...mutils-tasks/resource_pool_impl_state.hpp
diff --git a/resource_pool_impl_weak_resource.hpp → ...asks/resource_pool_impl_weak_resource.hpp b/resource_pool_impl_weak_resource.hpp → ...asks/resource_pool_impl_weak_resource.hpp
diff --git a/resource_pool_index_owner.hpp → ...utils-tasks/resource_pool_index_owner.hpp b/resource_pool_index_owner.hpp → ...utils-tasks/resource_pool_index_owner.hpp
diff --git a/resource_pool_rented_resources.hpp → ...-tasks/resource_pool_rented_resources.hpp b/resource_pool_rented_resources.hpp → ...-tasks/resource_pool_rented_resources.hpp
diff --git a/resource_pool_resource_packs.hpp → ...ls-tasks/resource_pool_resource_packs.hpp b/resource_pool_resource_packs.hpp → ...ls-tasks/resource_pool_resource_packs.hpp
diff --git a/resource_pool_resource_type.hpp → ...ils-tasks/resource_pool_resource_type.hpp b/resource_pool_resource_type.hpp → ...ils-tasks/resource_pool_resource_type.hpp
diff --git a/resource_pool_state.hpp → include/mutils-tasks/resource_pool_state.hpp b/resource_pool_state.hpp → include/mutils-tasks/resource_pool_state.hpp
diff --git a/mutils-tasksConfig.cmake b/mutils-tasksConfig.cmake
@@ -0,0 +1,2 @@
+set(mutils-tasks_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include")
+set(mutils-tasks_LIBRARIES "-L${CMAKE_INSTALL_PREFIX}/lib -lmutils-tasks")