diff options
| author | Naram Qashat <cyberbotx@cyberbotx.com> | 2011-12-03 19:17:41 -0500 |
|---|---|---|
| committer | Naram Qashat <cyberbotx@cyberbotx.com> | 2011-12-03 19:17:41 -0500 |
| commit | c80e7844b7fc76de944e338dd0c2634df054cf44 (patch) | |
| tree | 02b8815787d9a98df50eca57bb966cd24db1d516 | |
| parent | 620c08bd7a438126439310a66df539af015bddf0 (diff) | |
Attempt to fix issue with modules having their link libraries in the wrong order.
| -rw-r--r-- | cmake/Anope.cmake | 2 | ||||
| -rw-r--r-- | modules/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cmake/Anope.cmake b/cmake/Anope.cmake index 205a59631..26ed3926a 100644 --- a/cmake/Anope.cmake +++ b/cmake/Anope.cmake @@ -479,7 +479,7 @@ macro(calculate_libraries SRC SKIP SRC_LDFLAGS EXTRA_DEPENDS) endforeach(LIBRARY_PATH) # Iterate through libraries and add them to the linker flags foreach(LIBRARY ${LIBRARIES}) - set(THIS_LDFLAGS "${THIS_LDFLAGS} -l${LIBRARY}") + append_to_list(EXTRA_DEPENDENCIES "${LIBRARY}") endforeach(LIBRARY) set(${SRC_LDFLAGS} "${THIS_LDFLAGS}") set(${EXTRA_DEPENDS} "${EXTRA_DEPENDENCIES}") diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 6fa017fd6..e3156de4f 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -85,6 +85,8 @@ foreach(MODULE_FOLDER ${MODULES_FOLDERS}) if(WIN32) target_link_libraries(${SO} ${PROGRAM_NAME} wsock32 Ws2_32 ${WIN32_MEMORY} ${TEMP_DEPENDENCIES}) set_target_properties(${PROGRAM_NAME} PROPERTIES VERSION "${VERSION_DOTTED}") + else(WIN32) + target_link_libraries(${SO} ${PROGRAM_NAME} ${TEMP_DEPENDENCIES}) endif(WIN32) # Set the module to be installed to the module directory under the data directory install(TARGETS ${SO} |