diff options
| author | Bernd Wachter <bwachter-mana@lart.info> | 2010-01-29 12:17:49 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2010-01-29 14:41:46 +0100 |
| commit | 759535f6ca23b5d1d284db37c61e88ac01aefd2d (patch) | |
| tree | 90b1132de964e91dffff75e2b7bd9f8c3c8ce9b3 /src/CMakeLists.txt | |
| parent | d57c1777c7310088912fdd942f41b6c3ef5cb553 (diff) | |
| download | manaserv-759535f6ca23b5d1d284db37c61e88ac01aefd2d.tar.gz manaserv-759535f6ca23b5d1d284db37c61e88ac01aefd2d.tar.xz manaserv-759535f6ca23b5d1d284db37c61e88ac01aefd2d.zip | |
Fix build flags for optional libraries, add extra link libraries
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6e96cb3..192d1e5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -19,23 +19,26 @@ SET(FLAGS "${FLAGS} -DLOCALEDIR=\\\"${LOCALEDIR}/\\\"") # If the Sqlite option is enabled... IF (WITH_SQLITE) - FIND_PACKAGE(Sqlite REQUIRED) - INCLUDE_DIRECTORIES(${SQLITE_INCLUDE_DIR}) - SET(FLAGS "${FLAGS} -DBUILD_SQLITE") + FIND_PACKAGE(Sqlite3 REQUIRED) + INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR}) + SET(FLAGS "${FLAGS} -DSQLITE_SUPPORT") + SET(OPTIONAL_LIBRARIES ${OPTIONAL_LIBRARIES} ${SQLITE3_LIBRARIES}) ENDIF(WITH_SQLITE) # If the MySQL option is enabled... IF (WITH_MYSQL) FIND_PACKAGE(MySQL REQUIRED) INCLUDE_DIRECTORIES(${MYSQL_INCLUDE_DIR}) - SET(FLAGS "${FLAGS} -DBUILD_MYSQL") + SET(FLAGS "${FLAGS} -DMYSQL_SUPPORT") + SET(OPTIONAL_LIBRARIES ${OPTIONAL_LIBRARIES} ${MYSQL_LIBRARIES}) ENDIF() # If the postgreSQL option is enabled... IF (WITH_POSTGRESQL) FIND_PACKAGE(PostgreSQL REQUIRED) INCLUDE_DIRECTORIES(${POSTGRESQL_INCLUDE_DIR}) - SET(FLAGS "${FLAGS} -DBUILD_POSTGRESQL") + SET(FLAGS "${FLAGS} -DPOSTGRESQL_SUPPORT") + SET(OPTIONAL_LIBRARIES ${OPTIONAL_LIBRARIES} ${POSTGRESQL_LIBRARIES}) ENDIF() # If the Lua scripting language support is enabled... @@ -43,6 +46,7 @@ IF (ENABLE_LUA) FIND_PACKAGE(Lua51 REQUIRED) INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR}) SET(FLAGS "${FLAGS} -DBUILD_LUA") + SET(OPTIONAL_LIBRARIES ${OPTIONAL_LIBRARIES} ${LUA_LIBRARIES}) ENDIF() IF (CMAKE_BUILD_TYPE) @@ -267,6 +271,7 @@ FOREACH(program ${PROGRAMS}) TARGET_LINK_LIBRARIES(${program} ${ENET_LIBRARIES} ${PHYSFS_LIBRARY} ${LIBXML2_LIBRARIES} + ${OPTIONAL_LIBRARIES} ${EXTRA_LIBRARIES}) INSTALL(TARGETS ${program} RUNTIME DESTINATION ${PKG_BINDIR}) ENDFOREACH(program) |