diff options
| author | npmccallum <npmccallum@c587cffe-e639-0410-9787-d7902ae8ed56> | 2010-02-05 06:52:13 +0000 |
|---|---|---|
| committer | npmccallum <npmccallum@c587cffe-e639-0410-9787-d7902ae8ed56> | 2010-02-05 06:52:13 +0000 |
| commit | 25e1080dd5ae9ce82a33828d8acaaa4c61f44145 (patch) | |
| tree | 2b46686d96490d0a8753c146183dee4c126d064b /libproxy/CMakeLists.txt | |
| parent | ee59072c05c9a94556c3470a5a60571b84105781 (diff) | |
| download | libproxy-25e1080dd5ae9ce82a33828d8acaaa4c61f44145.tar.gz | |
massive rework; split off libmodman; make unit tests for libmodman; remove config_wpad; remove config_file (both intenal and module); remove config ordering support; merge lukas' kde plugin rework
git-svn-id: http://libproxy.googlecode.com/svn/trunk@513 c587cffe-e639-0410-9787-d7902ae8ed56
Diffstat (limited to 'libproxy/CMakeLists.txt')
| -rw-r--r-- | libproxy/CMakeLists.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libproxy/CMakeLists.txt b/libproxy/CMakeLists.txt index cdc12fb..8e223c8 100644 --- a/libproxy/CMakeLists.txt +++ b/libproxy/CMakeLists.txt @@ -1,9 +1,10 @@ ### Main library -add_library(libproxy SHARED config_file.cpp dl_module.cpp module_config.cpp module.cpp module_manager.cpp module_pacrunner.cpp module_wpad.cpp proxy.cpp url.cpp) +add_library(libproxy SHARED extension_config.cpp extension_pacrunner.cpp extension_wpad.cpp proxy.cpp url.cpp) +include_directories(../) if(WIN32) - target_link_libraries(libproxy ws2_32) + target_link_libraries(libproxy modman ws2_32) else() - target_link_libraries(libproxy m pthread dl) + target_link_libraries(libproxy modman m pthread dl) endif() file(TO_NATIVE_PATH ${moduledir} moduledir) if(WIN32) @@ -97,12 +98,10 @@ endif() # message("MODULES TO BUILD:") px_module(config_envvar "${UNIX}") -px_module(config_file "${UNIX}") px_module(config_gnome "${GNOME_FOUND}" ${X11_LIBRARIES}) px_module(config_kde4 "${KDE4_FOUND}" ${KDE4_LIBRARIES} ${X11_LIBRARIES}) px_module(config_macosx "${SC_FOUND}" ${SC_LIBRARIES} ${CF_LIBRARIES}) px_module(config_w32reg "${WIN32}") -px_module(config_wpad 1) px_module(ignore_domain 1) px_module(ignore_hostname 1) px_module(ignore_ip 1) |