Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed boost_context dependency from pkgconfig file and added BITNES… #89

Merged
merged 1 commit into from
May 20, 2019
Merged

Removed boost_context dependency from pkgconfig file and added BITNES… #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@ if (QUANTUM_VERBOSE_MAKEFILE)
message(STATUS "CMAKE_CXX_FLAGS = ${CMAKE_CXX_FLAGS}")
endif()

# Determine if this is a 32 or 64 bit build
string(FIND ${CMAKE_CXX_FLAGS} "-m64" BITNESS)

# Properly set the output directory
if (${BITNESS} EQUAL -1)
set(LIBDIR "lib")
else()
set(LIBDIR "lib64")
endif()

add_definitions(
-D_REENTRANT
-D_THREAD_SAFE
Expand Down
8 changes: 4 additions & 4 deletions quantum.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
libdir=${prefix}/lib
sharedlibdir=${prefix}/lib
libdir=${prefix}/@LIBDIR@
sharedlibdir=${prefix}/@LIBDIR@
includedir=${prefix}/include

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