Merge pull request #85 from accelerated/201_hotfix

Fixes for pkgconfig file generation

Author: Alex Damian

CMakeLists.txt

@@ -24,6 +24,9 @@ set(QUANTUM_VERSION "${QUANTUM_VERSION_MAJOR}.${QUANTUM_VERSION_MINOR}.${QUANTUM
 if (QUANTUM_INSTALL_ROOT)
     set(CMAKE_INSTALL_PREFIX ${QUANTUM_INSTALL_ROOT})
 endif()
+if (NOT QUANTUM_PKGCONFIG_DIR)
+    set(QUANTUM_PKGCONFIG_DIR share/pkgconfig)
+endif()
 
 #Global options
 set(MODE 64)
@@ -141,6 +144,7 @@ endif()
 if (QUANTUM_VERBOSE_MAKEFILE)
     message(STATUS "PROJECT_SOURCE_DIR = ${PROJECT_SOURCE_DIR}/")
     message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}")
+    message(STATUS "QUANTUM_PKGCONFIG_DIR = ${QUANTUM_PKGCONFIG_DIR}")
     message(STATUS "BOOST_ROOT = ${BOOST_ROOT}")
     message(STATUS "REQUIRED BOOST_VERSION = 1.61")
     message(STATUS "GTEST_ROOT = ${GTEST_ROOT}")

README.md

@@ -115,6 +115,8 @@ Various **CMake** options can be used to configure the output:
 * `QUANTUM_BOOST_USE_FIXEDSIZE_STACKS` : Use Boost fixed size stacks for coroutines. Default `OFF`.
 * `QUANTUM_INSTALL_ROOT`     : Specify custom install path.
                                Default is `/usr/local/include` for Linux or `c:/Program Files` for Windows.
+* `QUANTUM_PKGCONFIG_DIR`    : Specify custom install path for .pc file. Default is `${QUANTUM_INSTALL_ROOT}/share/pkgconfig`.
+                               To specify a relative path from `QUANTUM_INSTALL_ROOT`, omit leading `/`. 
 * `BOOST_ROOT`               : Specify a different Boost install directory.
 * `GTEST_ROOT`               : Specify a different GTest install directory.
 

quantum.pc.in

@@ -8,6 +8,6 @@ Name: quantum
 Url: https://github.com/bloomberg/quantum
 Description: C++ coroutine library using Boost.Coroutine2
 Version: @QUANTUM_VERSION@
-Requires: boost_context >= 1.61
+Requires.private: boost_context >= 1.61
 Libs: -L${libdir} -L${sharedlibdir} -L@Boost_LIBRARY_DIRS@ -lboost_context -lpthread
-Cflags: -I${includedir} -I@BOOST_ROOT@
+Cflags: -I${includedir} -I@Boost_INCLUDE_DIRS@

quantum/CMakeLists.txt

@@ -56,7 +56,7 @@ install(
     COMPONENT headers
 )
 install(
-    FILES PKG_CONFIG
-    DESTINATION share/pkgconfig
+    FILES ${PKG_CONFIG}
+    DESTINATION ${QUANTUM_PKGCONFIG_DIR}
     COMPONENT pkgconfig
 )

quantum/interface/quantum_icoro_context.h

@@ -513,7 +513,8 @@ using CoroContext = ICoroContext<RET>;
 
 template <class RET>
 using CoroContextPtr = typename ICoroContext<RET>::Ptr;
-using VoidContextPtr = CoroContextPtr<Void>;
+using VoidCoroContextPtr = CoroContextPtr<Void>;
+using VoidContextPtr = VoidCoroContextPtr; //shorthand version
 
 }}
 

quantum/quantum_functions.h

@@ -26,7 +26,8 @@ namespace quantum {
 struct Void{};
 template <typename T>
 struct ICoroContext;
-using VoidContextPtr = std::shared_ptr<ICoroContext<Void>>;
+using VoidCoroContextPtr = std::shared_ptr<ICoroContext<Void>>;
+using VoidContextPtr = VoidCoroContextPtr; //shorthand version
 
 //==============================================================================================
 //                                    struct Functions

tests/CMakeLists.txt

@@ -4,11 +4,11 @@ file(GLOB SOURCE_FILES *.cpp)
 include_directories(AFTER
     ${PROJECT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${BOOST_ROOT}
+    ${Boost_INCLUDE_DIRS}
     ${GTEST_ROOT}
 )
 link_directories(
-    ${BOOST_ROOT}
+    ${Boost_LIBRARY_DIRS}
     ${GTEST_ROOT}
 )
 add_executable(${TEST_TARGET} ${SOURCE_FILES})