diff options
| author | Sebastien Helleu <flashcode@flashtux.org> | 2007-08-31 13:28:05 +0000 |
|---|---|---|
| committer | Sebastien Helleu <flashcode@flashtux.org> | 2007-08-31 13:28:05 +0000 |
| commit | 72d9c51ab0696fb9eba5147bbba7aa1c02a3d75a (patch) | |
| tree | 9e2110b4f939e04d3be010efb3a865f1f9f5980a | |
| parent | 5218a359af7d58a30244ce16c75b311d8c7bb002 (diff) | |
| download | weechat-72d9c51ab0696fb9eba5147bbba7aa1c02a3d75a.zip | |
Changed order of compilation for source directories with cmake
| -rw-r--r-- | src/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | src/common/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/plugins/CMakeLists.txt | 2 |
3 files changed, 12 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7cdf430a3..41f271f7b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -83,15 +83,19 @@ IF(NOT DISABLE_GNUTLS) ENDIF(GNUTLS_FOUND) ENDIF(NOT DISABLE_GNUTLS) +# Check for iconv +FIND_PACKAGE(Iconv) +IF(ICONV_FOUND) + ADD_DEFINITIONS( -DHAVE_ICONV ) +ENDIF(ICONV_FOUND) + IF(NOT DISABLE_PLUGINS) FIND_LIBRARY(DL_LIBRARY NAMES dl PATHS /lib /usr/lib /usr/libexec /usr/local/lib /usr/local/libexec ) - ADD_DEFINITIONS(-DPLUGINS) LIST(APPEND STATIC_LIBS weechat_plugins) - ADD_SUBDIRECTORY( plugins ) IF(DL_LIBRARY) STRING(REGEX REPLACE "/[^/]*$" "" DL_LIBRARY_PATH "${DL_LIBRARY}") SET(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -L${DL_LIBRARY_PATH}") @@ -101,6 +105,12 @@ ENDIF(NOT DISABLE_PLUGINS) ADD_SUBDIRECTORY( common ) List(APPEND STATIC_LIBS weechat_main) + ADD_SUBDIRECTORY( irc ) LIST(APPEND STATIC_LIBS weechat_irc) + +IF(NOT DISABLE_PLUGINS) + ADD_SUBDIRECTORY( plugins ) +ENDIF(NOT DISABLE_PLUGINS) + ADD_SUBDIRECTORY( gui ) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index abda841ba..8f48d90b2 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -24,9 +24,5 @@ INCLUDE(CheckSymbolExists) CHECK_INCLUDE_FILES("sys/file.h" HAVE_SYS_FILE_H) CHECK_SYMBOL_EXISTS(flock "sys/file.h" HAVE_FLOCK) -IF(ICONV_FOUND) - ADD_DEFINITIONS( -DHAVE_ICONV ) -ENDIF(ICONV_FOUND) - INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}) ADD_LIBRARY(weechat_main STATIC ${LIB_MAIN_SRC}) diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index e1b9d48c8..1a0ada8ea 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -34,9 +34,7 @@ ENDIF(NOT DISABLE_ASPELL) IF (NOT DISABLE_CHARSET) # Check for iconv support. - FIND_PACKAGE(Iconv) IF(ICONV_FOUND) - ADD_DEFINITIONS( -DHAVE_ICONV ) ADD_SUBDIRECTORY( charset ) ENDIF(ICONV_FOUND) ENDIF(NOT DISABLE_CHARSET) |