... Your revert re-introduces a problem that hasn't been fixed. I'm not saying that this isn't a problem elsewhere, but it manifests in colorfilter and so far only there. If you care to explain how exactly the colorfilter plugin can find the DATADIR definition, I can check.
I don't think it's very reasonable to just write this off as "Kristian can't manage a build system!" and revert what provably fixes a problem. Keep in mind that we already discussed this and I checked the cryptic build system that's supposed to do this, and I did find the definitions on my system, so this isn't just core being out of sync for example. In fact, I spent a couple HOURS checking before I even did the initial commit, because I assumed that this was supposed to come from somewhere else. But it didn't. It would be nice if we could avoid commit-wars like that, so I'm not going to re-apply my local fix. But I would like an explanation as to where DATADIR is set and _exactly_ how it propagates to the colorfilter plugin. Otherwise it's hard to fix the real issue at hand. While I have already read large amounts of commit logs and cmakelists that relates, it's time you explained it since you are reverting what fixes a problem on my end. This is what I'm talking about: kristian@luke:~/.../plugins-main/build$ make [ 4%] Built target winrules [ 8%] Built target mousepoll [ 10%] Built target text [ 14%] Built target thumbnail [ 17%] Built target shift [ 21%] Built target snap [ 24%] Built target ring [ 27%] Built target neg [ 30%] Built target wall [ 33%] Built target kdecompat [ 37%] Built target workarounds [ 41%] Built target scaleaddon [ 45%] Built target imgjpeg [ 46%] Building CXX object colorfilter/CMakeFiles/colorfilter.dir/src/parser.cpp.o /home/kristian/Source/compiz/plugins-main/colorfilter/src/parser.cpp: In member function ‘CompString FragmentParser::programReadSource(const CompString&)’: /home/kristian/Source/compiz/plugins-main/colorfilter/src/parser.cpp:107: error: ‘DATADIR’ was not declared in this scope make[2]: *** [colorfilter/CMakeFiles/colorfilter.dir/src/parser.cpp.o] Error 1 make[1]: *** [colorfilter/CMakeFiles/colorfilter.dir/all] Error 2 make: *** [all] Error 2 And: commit 75ebe33fa30ef779abf92420429008f5ffdea666 Author: Sam Spilsbury <[email protected]> Date: Sun Nov 14 11:51:51 2010 +0800 CompizPlugin automatically sets DATADIR to whereever you installed the plugin, no need t Revert "Add the DATADIR definition to CMakeLists" This reverts commit dd26a937f3cb7a132aacfd07628497b30c832a5b. commit 1558409a93f0f5803a0d6441ac6dcbff7dfaeff0 Merge: 46bc7db dd26a93 Author: Sam Spilsbury <[email protected]> Date: Sun Nov 14 11:51:19 2010 +0800 Merge branch 'master' of git+ssh://git.opencompositing.org/git/compiz/plugins/colorfilte commit dd26a937f3cb7a132aacfd07628497b30c832a5b Author: Kristian Lyngstol <[email protected]> Date: Sat Nov 13 20:57:18 2010 +0100 Add the DATADIR definition to CMakeLists Hopefully, this, is reasonably correct. Regards, Kristian
signature.asc
Description: Digital signature
_______________________________________________ dev mailing list [email protected] http://lists.compiz.org/mailman/listinfo/dev
