diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2012-11-22 18:23:21 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-11-22 18:30:47 +0100 |
| commit | 2a996d85eda62bb4e40bb978446611459ff934da (patch) | |
| tree | 0a7d9917a927b49873c9a598f8a34fc863a67774 /filesharing/advanced | |
| parent | ddb25c68b3bd921980f50d3b14678be9887768bf (diff) | |
| download | tdenetwork-2a996d85eda62bb4e40bb978446611459ff934da.tar.gz tdenetwork-2a996d85eda62bb4e40bb978446611459ff934da.zip | |
Fix cmake build: add dependencies for filesharing parallel build
Thanks to Fat-Zer
(cherry picked from commit 6ab3b4d320a0c673f0f4ed091a94373e8d9a7875)
Diffstat (limited to 'filesharing/advanced')
4 files changed, 27 insertions, 5 deletions
diff --git a/filesharing/advanced/kcm_sambaconf/CMakeLists.txt b/filesharing/advanced/kcm_sambaconf/CMakeLists.txt index 9ed92497..db5c89da 100644 --- a/filesharing/advanced/kcm_sambaconf/CMakeLists.txt +++ b/filesharing/advanced/kcm_sambaconf/CMakeLists.txt @@ -37,6 +37,24 @@ tde_add_library( filesharesamba STATIC_PIC AUTOMOC filemodedlgimpl.cpp smbpasswdfile.cpp passwd.cpp hiddenfileview.cpp dictmanager.cpp qmultichecklistitem.cpp smbconfconfigwidget.cpp linuxpermissionchecker.cpp expertuserdlg.ui + DEPENDENCIES filesharesamba_generate_headers +) + +# Those headers are also required by target in another subdirectory. +# So we have to add such target for our generated header files to avoid +# race conditions. +# SEE cmake FAQ: http://www.cmake.org/Wiki/CMake_FAQ +# +add_custom_target( filesharesamba_generate_headers + DEPENDS + ${CMAKE_CURRENT_BINARY_DIR}/share.h + ${CMAKE_CURRENT_BINARY_DIR}/share.h + ${CMAKE_CURRENT_BINARY_DIR}/socketoptionsdlg.h + ${CMAKE_CURRENT_BINARY_DIR}/userselectdlg.h + ${CMAKE_CURRENT_BINARY_DIR}/groupselectdlg.h + ${CMAKE_CURRENT_BINARY_DIR}/usertab.h + ${CMAKE_CURRENT_BINARY_DIR}/filemodedlg.h + ${CMAKE_CURRENT_BINARY_DIR}/expertuserdlg.h ) diff --git a/filesharing/advanced/propsdlgplugin/CMakeLists.txt b/filesharing/advanced/propsdlgplugin/CMakeLists.txt index 26d94f56..bd96ae62 100644 --- a/filesharing/advanced/propsdlgplugin/CMakeLists.txt +++ b/filesharing/advanced/propsdlgplugin/CMakeLists.txt @@ -11,7 +11,8 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/../kcm_sambaconf + ${CMAKE_BINARY_DIR}/filesharing/advanced/kcm_sambaconf + ${CMAKE_SOURCE_DIR}/filesharing/advanced/kcm_sambaconf ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -32,7 +33,7 @@ install( FILES tde_add_library( propsdlgplugin_common STATIC_PIC AUTOMOC SOURCES propertiespage.cpp propertiespagegui.ui - DEPENDENCIES filesharesamba + DEPENDENCIES filesharesamba_generate_headers ) diff --git a/filesharing/advanced/propsdlgplugin/Makefile.am b/filesharing/advanced/propsdlgplugin/Makefile.am index 2d3d829d..8017e98a 100644 --- a/filesharing/advanced/propsdlgplugin/Makefile.am +++ b/filesharing/advanced/propsdlgplugin/Makefile.am @@ -1,5 +1,8 @@ METASOURCES = AUTO +INCLUDES = -I$(top_srcdir)/filesharing/advanced/kcm_sambaconf \ + -I$(top_builddir)/filesharing/advanced/kcm_sambaconf \ + $(all_includes) kde_module_LTLIBRARIES = fileshare_propsdlgplugin.la diff --git a/filesharing/advanced/propsdlgplugin/propertiespage.cpp b/filesharing/advanced/propsdlgplugin/propertiespage.cpp index d0f23a07..45fd9131 100644 --- a/filesharing/advanced/propsdlgplugin/propertiespage.cpp +++ b/filesharing/advanced/propsdlgplugin/propertiespage.cpp @@ -44,9 +44,9 @@ #include "../nfs/nfsdialog.h" // Samba related -#include "../kcm_sambaconf/sambafile.h" -#include "../kcm_sambaconf/sambashare.h" -#include "../kcm_sambaconf/sharedlgimpl.h" +#include "sambafile.h" +#include "sambashare.h" +#include "sharedlgimpl.h" #include "propertiespage.h" |