Fixed shared build on windows. Prefixed compile options.

This commit is contained in:
Aart Stuurman 2018-01-29 00:28:50 +01:00
parent 144ec66e61
commit 221ed561d9
1 changed files with 11 additions and 9 deletions

View File

@ -16,8 +16,8 @@ cmake_minimum_required(VERSION 3.1)
project(amqpcpp) project(amqpcpp)
# build options # build options
option(BUILD_SHARED "Build shared library. If off, build will be static." OFF) option(AMQP-CPP_BUILD_SHARED "Build shared library. If off, build will be static." OFF)
option(LINUX_TCP "Build linux sockets implementation." OFF) option(AMQP-CPP_LINUX_TCP "Build linux sockets implementation." OFF)
# ensure c++11 on all compilers # ensure c++11 on all compilers
set (CMAKE_CXX_STANDARD 11) set (CMAKE_CXX_STANDARD 11)
@ -47,16 +47,16 @@ endmacro()
# add source files # add source files
add_subdirectory(src) add_subdirectory(src)
if(LINUX_TCP) if(AMQP-CPP_LINUX_TCP)
add_subdirectory(src/linux_tcp) add_subdirectory(src/linux_tcp)
endif() endif()
# settings for specific compilers # settings for specific compilers
# ------------------------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------------------------
# we have to prevent windows from defining the max macro. TODO why WIN32_LEAN_AND_MEAN? # we have to prevent windows from defining the max macro.
if (WIN32) if (WIN32)
add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN) add_definitions(-DNOMINMAX)
endif() endif()
# build targets # build targets
@ -65,7 +65,7 @@ endif()
# set output directory # set output directory
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin) set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin)
if(BUILD_SHARED) if(AMQP-CPP_BUILD_SHARED)
# create shared lib # create shared lib
add_library(${PROJECT_NAME} SHARED ${SRCS}) add_library(${PROJECT_NAME} SHARED ${SRCS})
# set shared lib version # set shared lib version
@ -78,13 +78,15 @@ endif()
# install rules # install rules
# ------------------------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------------------------
if(BUILD_SHARED) if(AMQP-CPP_BUILD_SHARED)
# copy static lib # copy shared lib and its static counter part
install(TARGETS ${PROJECT_NAME} install(TARGETS ${PROJECT_NAME}
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib LIBRARY DESTINATION lib
RUNTIME DESTINATION lib
) )
else() else()
# copy shared lib and its static counter part # copy static lib
install(TARGETS ${PROJECT_NAME} install(TARGETS ${PROJECT_NAME}
ARCHIVE DESTINATION lib ARCHIVE DESTINATION lib
) )