diff options
| author | Naram Qashat <cyberbotx@cyberbotx.com> | 2011-11-20 18:32:47 -0500 |
|---|---|---|
| committer | Naram Qashat <cyberbotx@cyberbotx.com> | 2011-11-20 18:32:47 -0500 |
| commit | 5a17b060feedd6037a2037f7cea23fd58129541e (patch) | |
| tree | d8a731ca9a5fc361796ceb3cf885cc9d3b2da9d7 | |
| parent | bf8e4ac71484cfe30bcddd02cb91900875dc34b2 (diff) | |
Really fix linking in libraries (even if gettext isn't found on *nix), and a minor nitpick about the leading spaces on LINK_LIBS.
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0249d831e..18e0f9177 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -357,6 +357,10 @@ endif(CXXFLAGS) if(LDFLAGS) strip_string(${LDFLAGS} LDFLAGS) endif(LDFLAGS) +# Strip the leading and trailing spaces from the link libraries +if(LINK_LIBS) + strip_string(${LINK_LIBS} LINK_LIBS) +endif(LINK_LIBS) # Search for the following programs find_program(GREP grep) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a00c53d98..01dc44fbc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -98,6 +98,8 @@ if(WIN32) else(WIN32) if(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 |