Browse Source

* moved source files to subdirectory

* created options.cmake
master
bergmann 7 years ago
parent
commit
b3deff6061
7 changed files with 7 additions and 2 deletions
  1. +1
    -0
      cmake/options.cmake
  2. +4
    -2
      src/CMakeLists.txt
  3. +0
    -0
      src/cppamqp/channel.cpp
  4. +0
    -0
      src/cppamqp/connection.cpp
  5. +0
    -0
      src/cppamqp/helper.cpp
  6. +0
    -0
      src/cppamqp/publish_options.cpp
  7. +2
    -0
      test/CMakeLists.txt

+ 1
- 0
cmake/options.cmake View File

@@ -0,0 +1 @@
Option ( CPPAMQP_BUILD_SHARED "Build cppamqp shared library" OFF )

+ 4
- 2
src/CMakeLists.txt View File

@@ -4,9 +4,9 @@ Include ( cotire OPTIONAL )
Include ( pedantic OPTIONAL ) Include ( pedantic OPTIONAL )
Include ( strip_symbols OPTIONAL ) Include ( strip_symbols OPTIONAL )


Option ( BUILD_SHARED_CPPAMQP "Build cppamqp shared library" OFF )
Include ( ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/options.cmake )


Set ( BUILD_SHARED_LIBS ${BUILD_SHARED_CPPAMQP} )
Set ( BUILD_SHARED_LIBS ${CPPAMQP_BUILD_SHARED} )
Set ( CMAKE_CXX_STANDARD 17 ) Set ( CMAKE_CXX_STANDARD 17 )
Set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PEDANTIC_C_FLAGS}" ) Set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PEDANTIC_C_FLAGS}" )
Set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PEDANTIC_CXX_FLAGS}" ) Set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PEDANTIC_CXX_FLAGS}" )
@@ -14,6 +14,7 @@ Set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PEDANTIC_CXX
# Dependencies #################################################################################### # Dependencies ####################################################################################


Find_Package ( cpputils REQUIRED ) Find_Package ( cpputils REQUIRED )
Find_Package ( rabbitmq REQUIRED )


# Project: cppamqp ############################################################################### # Project: cppamqp ###############################################################################


@@ -27,6 +28,7 @@ Target_Include_Directories (
Target_Link_Libraries ( Target_Link_Libraries (
cppamqp cppamqp
cpputils cpputils
rabbitmq
) )
If ( __COTIRE_INCLUDED ) If ( __COTIRE_INCLUDED )
Cotire ( cppamqp ) Cotire ( cppamqp )


src/channel.cpp → src/cppamqp/channel.cpp View File


src/connection.cpp → src/cppamqp/connection.cpp View File


src/helper.cpp → src/cppamqp/helper.cpp View File


src/publish_options.cpp → src/cppamqp/publish_options.cpp View File


+ 2
- 0
test/CMakeLists.txt View File

@@ -4,6 +4,8 @@ Include ( cotire OPTIONAL )
Include ( pedantic OPTIONAL ) Include ( pedantic OPTIONAL )
Include ( cmake_tests OPTIONAL ) Include ( cmake_tests OPTIONAL )


Include ( ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/options.cmake )

Set ( CMAKE_CXX_STANDARD 17 ) Set ( CMAKE_CXX_STANDARD 17 )
Set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PEDANTIC_C_FLAGS}" ) Set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PEDANTIC_C_FLAGS}" )
Set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PEDANTIC_CXX_FLAGS}" ) Set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PEDANTIC_CXX_FLAGS}" )


Loading…
Cancel
Save