[Lunar-commits] <lunar> build.lunar: Changing the behavior of cmake_build_target(). The instigator for this function

Dennis `stumbles` Veatch stumbles at lunar-linux.org
Fri Aug 19 10:25:10 CEST 2011


commit b792f6e0cec658267f259df91a8b4ee03379619e
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Fri Aug 19 04:25:10 2011 -0400

    build.lunar: Changing the behavior of cmake_build_target(). The instigator for this function
    
    was kdebindings-4.6.x not picking up our $OPTS with an out of source build. Now that kde-4.7.0
    is out it no longer exists with its guts being separated into the individual bindings.
    
    I ran into a problem with kdepim-runtime-4.7.0; doing an in source build would fail because it
    would not use a settings.h file and thus tank on some akonadi stuff during the make. After some
    time a #akonadi an out of source build was done and all was well.
    
    If you are realizing there are inconsistancies between these build types you are correct. Of all the
    documentation I have read either should work fine with an out of source being the *prefered* method.
    
    So this commit simply does away with the detection of that macro and defaults to an out of source. For
    those modules that need an in source build the dev can simply use something like;
    
    cmake . $OPTS blah blah.
    
    in the BUILD.
---
 var/lib/lunar/functions/build.lunar |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/var/lib/lunar/functions/build.lunar b/var/lib/lunar/functions/build.lunar
index acf718b..568918a 100644
--- a/var/lib/lunar/functions/build.lunar
+++ b/var/lib/lunar/functions/build.lunar
@@ -164,15 +164,16 @@ _configure()
 
 
 # cmake can be run two ways: in source and out of source. The determinante method is
-# to look for a cmake macro, if it exists then do out of source.
+# to look for a cmake macro, if it exists then do out of source. There have been inconsistancies
+# with this, some apps compile fine out of source and others do not with the leaning towards 
+# more wanting out of source even though they do not say so. Making this the default and
+# for those that do not want it, specify it in the BUILD.
 cmake_build_target() {
   debug_msg "cmake_build_target ($@)"
-  if [ -e cmake/modules/MacroEnsureOutOfSourceBuild.cmake ]; then
     verbose_msg "running \"Out of source build is required; configuring\""
     OOSB_DIR="$SOURCE_DIRECTORY/$MODULE-oosb"  &&
     mkdir $OOSB_DIR                            &&
     cd $OOSB_DIR
-  fi
 }
 
 


More information about the Lunar-commits mailing list