diff options
| author | Adam <Adam@anope.org> | 2011-11-21 16:24:45 -0500 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2011-11-21 16:24:45 -0500 |
| commit | 12d0a7302f76fe21c54ffcead286fc31e870b817 (patch) | |
| tree | 182438d78f08f3e75863ae7141ee224e3f048749 /src | |
| parent | 0dd85f776110ddfa0c757aab92c7d1627b93996f (diff) | |
| parent | 51d6e8ebfbacdbae659dde213c619024e86bf73d (diff) | |
Merge branch '1.9' of ssh://anope.git.sf.net/gitroot/anope/anope into 1.9
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a51bc3057..01dc44fbc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -93,11 +93,13 @@ add_executable(${PROGRAM_NAME} ${SRC_SRCS}) set_target_properties(${PROGRAM_NAME} PROPERTIES LINKER_LANGUAGE CXX LINK_FLAGS "${LDFLAGS}" ENABLE_EXPORTS ON) # On Windows, also link Anope to the wsock32 and Ws2_32 library, as well as set the version if(WIN32) - target_link_libraries(${PROGRAM_NAME} wsock32 Ws2_32 ${GETTEXT_LIBRARIES} ${WIN32_MEMORY}) + target_link_libraries(${PROGRAM_NAME} wsock32 Ws2_32 ${LINK_LIBS} ${GETTEXT_LIBRARIES} ${WIN32_MEMORY}) set_target_properties(${PROGRAM_NAME} PROPERTIES VERSION "${VERSION_DOTTED}") else(WIN32) if(GETTEXT_LIBRARIES) - target_link_libraries(${PROGRAM_NAME} ${GETTEXT_LIBRARIES}) + target_link_libraries(${PROGRAM_NAME} ${LINK_LIBS} ${GETTEXT_LIBRARIES}) + else(GETTEXT_LIBRARIES) + target_link_libraries(${PROGRAM_NAME} ${LINK_LIBS}) endif(GETTEXT_LIBRARIES) endif(WIN32) # Building the Anope executable requires the version.h header to be generated |