fixup! Don't compile the utils files multiple times.
This commit is contained in:
parent
e7aa63f3bd
commit
af083efb0c
@ -93,6 +93,7 @@ add_library(network STATIC ${network_SOURCES})
|
||||
add_library(utils STATIC ${utils_SOURCES})
|
||||
if(CMAKE_COMPILER_IS_GNUCC)
|
||||
set_target_properties(utils PROPERTIES COMPILE_FLAGS -fPIC)
|
||||
set_target_properties(network PROPERTIES COMPILE_FLAGS -fPIC)
|
||||
endif()
|
||||
|
||||
add_dependencies(adc utils)
|
||||
@ -101,21 +102,20 @@ add_dependencies(network utils)
|
||||
add_executable(uhub ${PROJECT_SOURCE_DIR}/core/main.c ${uhub_SOURCES} )
|
||||
|
||||
add_library(mod_example MODULE ${PROJECT_SOURCE_DIR}/plugins/mod_example.c)
|
||||
add_library(mod_welcome MODULE ${PROJECT_SOURCE_DIR}/plugins/mod_welcome.c ${network_SOURCES})
|
||||
add_library(mod_logging MODULE ${PROJECT_SOURCE_DIR}/plugins/mod_logging.c ${PROJECT_SOURCE_DIR}/adc/sid.c ${network_SOURCES})
|
||||
add_library(mod_welcome MODULE ${PROJECT_SOURCE_DIR}/plugins/mod_welcome.c)
|
||||
add_library(mod_logging MODULE ${PROJECT_SOURCE_DIR}/plugins/mod_logging.c ${PROJECT_SOURCE_DIR}/adc/sid.c)
|
||||
add_library(mod_auth_simple MODULE ${PROJECT_SOURCE_DIR}/plugins/mod_auth_simple.c )
|
||||
add_library(mod_chat_history MODULE ${PROJECT_SOURCE_DIR}/plugins/mod_chat_history.c )
|
||||
add_library(mod_chat_only MODULE ${PROJECT_SOURCE_DIR}/plugins/mod_chat_only.c)
|
||||
add_library(mod_topic MODULE ${PROJECT_SOURCE_DIR}/plugins/mod_topic.c)
|
||||
|
||||
if (SQLITE_SUPPORT)
|
||||
add_library(mod_auth_sqlite MODULE ${PROJECT_SOURCE_DIR}/plugins/mod_auth_sqlite.c ${utils_SOURCES})
|
||||
add_executable(uhub-passwd ${PROJECT_SOURCE_DIR}/tools/uhub-passwd.c ${PROJECT_SOURCE_DIR}/util/misc.c ${PROJECT_SOURCE_DIR}/util/memory.c ${PROJECT_SOURCE_DIR}/util/log.c ${PROJECT_SOURCE_DIR}/util/list.c)
|
||||
add_library(mod_auth_sqlite MODULE ${PROJECT_SOURCE_DIR}/plugins/mod_auth_sqlite.c)
|
||||
add_executable(uhub-passwd ${PROJECT_SOURCE_DIR}/tools/uhub-passwd.c)
|
||||
|
||||
target_link_libraries(mod_auth_sqlite sqlite3)
|
||||
target_link_libraries(uhub-passwd sqlite3)
|
||||
target_link_libraries(mod_auth_sqlite sqlite3 utils)
|
||||
target_link_libraries(uhub-passwd sqlite3 utils)
|
||||
set_target_properties(mod_auth_sqlite PROPERTIES PREFIX "")
|
||||
target_link_libraries(mod_auth_sqlite utils)
|
||||
|
||||
if (UNIX)
|
||||
target_link_libraries(uhub pthread)
|
||||
@ -149,6 +149,9 @@ target_link_libraries(mod_chat_only utils)
|
||||
target_link_libraries(mod_logging utils)
|
||||
target_link_libraries(mod_topic utils)
|
||||
|
||||
target_link_libraries(mod_welcome network)
|
||||
target_link_libraries(mod_logging network)
|
||||
|
||||
if(UNIX)
|
||||
add_library(adcclient STATIC ${adcclient_SOURCES})
|
||||
add_executable(uhub-admin ${PROJECT_SOURCE_DIR}/tools/admin.c)
|
||||
|
Loading…
Reference in New Issue
Block a user