aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Overhaul common's CMakeLists.txt

Browse source 
* Use automoc instead of a manual list of headers
* Remove Qt4 detection
* Created missing .cpp for .h files (for automoc detection)
* Remove pthread linking
* Forcing -lprotobuf is not needed for mingw; msvc only?
This commit is contained in:
Fabio Bas 2014-06-11 01:24:34 +02:00
parent 62f756e698
commit 4fd8c94df0
4 changed files with 10 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
common/CMakeLists.txt
View file

@ -9,10 +9,12 @@ SET(common_SOURCES
server.cpp server.cpp
server_abstractuserinterface.cpp server_abstractuserinterface.cpp
server_arrow.cpp server_arrow.cpp
server_arrowtarget.h
server_card.cpp server_card.cpp
server_cardzone.cpp server_cardzone.cpp
server_counter.cpp server_counter.cpp
server_game.cpp server_game.cpp
server_database_interface.cpp
server_player.cpp server_player.cpp
server_protocolhandler.cpp server_protocolhandler.cpp
server_remoteuserinterface.cpp server_remoteuserinterface.cpp
@ -21,34 +23,12 @@ SET(common_SOURCES
serverinfo_user_container.cpp serverinfo_user_container.cpp
sfmt/SFMT.c sfmt/SFMT.c
) )
SET(common_HEADERS
decklist.h
rng_abstract.h
rng_sfmt.h
server.h
server_arrowtarget.h
server_card.h
server_database_interface.h
server_game.h
server_player.h
server_protocolhandler.h
server_room.h
)
FIND_PACKAGE(Qt4 REQUIRED)
FIND_PACKAGE(Protobuf REQUIRED)
QT4_WRAP_CPP(common_HEADERS_MOC ${common_HEADERS})
INCLUDE(${QT_USE_FILE}) INCLUDE(${QT_USE_FILE})
INCLUDE_DIRECTORIES(pb) INCLUDE_DIRECTORIES(pb)
INCLUDE_DIRECTORIES(sfmt) INCLUDE_DIRECTORIES(sfmt)
INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
add_library(cockatrice_common ${common_SOURCES} ${common_HEADERS_MOC}) add_library(cockatrice_common ${common_SOURCES} ${common_MOC_SRCS})
# Without this check, Linux will put -pthread out of order in link.txt and build will fail
if (UNIX)
target_link_libraries(cockatrice_common cockatrice_protocol pthread)
else (UNIX)
target_link_libraries(cockatrice_common cockatrice_protocol) target_link_libraries(cockatrice_common cockatrice_protocol)
endif (UNIX)

5
common/pb/CMakeLists.txt
View file

@ -144,14 +144,13 @@ SET(PROTO_FILES
session_event.proto session_event.proto
) )
find_package(Protobuf REQUIRED)
include_directories(${PROTOBUF_INCLUDE_DIRS}) include_directories(${PROTOBUF_INCLUDE_DIRS})
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${PROTO_FILES}) PROTOBUF_GENERATE_CPP(PROTO_SRCS PROTO_HDRS ${PROTO_FILES})
add_library(cockatrice_protocol ${PROTO_SRCS} ${PROTO_HDRS}) add_library(cockatrice_protocol ${PROTO_SRCS} ${PROTO_HDRS})
set(cockatrice_protocol_LIBS ${PROTOBUF_LIBRARIES}) set(cockatrice_protocol_LIBS ${PROTOBUF_LIBRARIES})
if (WIN32) if (MSVC)
set(cockatrice_protocol_LIBS ${cockatrice_protocol_LIBS} -lprotobuf) set(cockatrice_protocol_LIBS ${cockatrice_protocol_LIBS} -lprotobuf)
endif (WIN32) endif (MSVC)
target_link_libraries(cockatrice_protocol ${cockatrice_protocol_LIBS}) target_link_libraries(cockatrice_protocol ${cockatrice_protocol_LIBS})

2
common/server_arrowtarget.cpp Normal file
View file

@ -0,0 +1,2 @@
#include "server_arrowtarget.h"

2
common/server_database_interface.cpp Normal file
View file

@ -0,0 +1,2 @@
#include "server_database_interface.h"