diff options
| author | click <none@none> | 2010-08-10 19:15:50 +0200 |
|---|---|---|
| committer | click <none@none> | 2010-08-10 19:15:50 +0200 |
| commit | 4f9ec558f41c3eeb1a5279fd7cc4dfbaedfaab4c (patch) | |
| tree | 5e8a9a55b6635fc6ed6965838eee01f4a77de8a1 | |
| parent | b29e64bd1ff799ea6aeb9cf075b28e26a159fe46 (diff) | |
Buildsystem/Linux: Remove -DCENTOS flag and enforce linking with ncurses in case of older revisions of CentOS (thanks to QAston and vaska94/kingwee)
Closes issue 2908
--HG--
branch : trunk
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/server/worldserver/CMakeLists.txt | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 024913bd5c7..86e51747b8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,14 +88,12 @@ option(GAMEPCH "Use precompiled headers when compiling game project" 1) option(SQL "Copy SQL files during installation" 0) option(WARNINGS "Enable all compile-warnings during compile" 0) +# +# Search for readline on *nixbased systems (CLI-handler) +# + if( UNIX ) - option(CENTOS "CENTOS" 0) - if( CENTOS ) - add_definitions(-DCENTOS) - find_termcap() - else() - find_readline() - endif() + find_readline() endif() # diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index f32c574135b..d73a25f2354 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -138,7 +138,7 @@ endif() add_dependencies(worldserver genrev) if( UNIX ) - set(worldserver_LINK_FLAGS "-pthread ${worldserver_LINK_FLAGS}") + set(worldserver_LINK_FLAGS "-pthread -lncurses ${worldserver_LINK_FLAGS}") endif() if( CMAKE_SYSTEM_NAME MATCHES "Darwin" ) |