widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/cmake-unused-variables into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~hjd/widelands/cmake-unused-variables/+merge/236948

Removes references to
WL_PORTABLE
WL_LINGUAS


The former was recently removed from our CMake setup and has no effect. The latter doesn't seem to ever be assigned a value, and apart from a slight (probably not noticable) increase in disk space required for the build I don't see any drawbacks in always building all locales. 
-- 
https://code.launchpad.net/~hjd/widelands/cmake-unused-variables/+merge/236948
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/cmake-unused-variables into lp:widelands.

=== modified file 'compile.sh'
--- compile.sh	2014-08-06 14:43:40 +0000
+++ compile.sh	2014-10-02 18:54:22 +0000
@@ -73,9 +73,9 @@
     echo "for instructions on how to adjust options and build with CMake."
 
     if [ $buildtool = "ninja" ] || [ $buildtool = "ninja-build" ] ; then
-      cmake -G Ninja -DWL_PORTABLE=true .. -DCMAKE_BUILD_TYPE="Debug"
+      cmake -G Ninja .. -DCMAKE_BUILD_TYPE=Debug
     else
-      cmake -DWL_PORTABLE=true .. -DCMAKE_BUILD_TYPE="Debug"
+      cmake .. -DCMAKE_BUILD_TYPE=Debug
     fi
 
     $buildtool

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2014-08-06 14:43:40 +0000
+++ po/CMakeLists.txt	2014-10-02 18:54:22 +0000
@@ -37,18 +37,14 @@
 endmacro(CreateLocale locale_name)
 
 set (languages_found "")
-if (DEFINED WL_LINGUAS AND NOT WL_LINGUAS STREQUAL "")
-  set(languages_found ${WL_LINGUAS})
-else (DEFINED WL_LINGUAS AND NOT WL_LINGUAS STREQUAL "")
-  file (GLOB_RECURSE pofiles *.po)
-  foreach(pofile ${pofiles})
-    get_filename_component(pofile ${pofile} NAME_WE)
-    list(APPEND languages_found ${pofile})
-  endforeach(pofile ${pofiles})
+file (GLOB_RECURSE pofiles *.po)
+foreach(pofile ${pofiles})
+  get_filename_component(pofile ${pofile} NAME_WE)
+  list(APPEND languages_found ${pofile})
+endforeach(pofile ${pofiles})
 
-  list(SORT languages_found)
-  list(REMOVE_DUPLICATES languages_found)
-endif (DEFINED WL_LINGUAS AND NOT WL_LINGUAS STREQUAL "")
+list(SORT languages_found)
+list(REMOVE_DUPLICATES languages_found)
 
 foreach(language ${languages_found})
   CreateLocale(${language})

=== modified file 'utils/scan-build.sh'
--- utils/scan-build.sh	2013-07-17 12:29:03 +0000
+++ utils/scan-build.sh	2014-10-02 18:54:22 +0000
@@ -20,9 +20,7 @@
 mkdir -p $BUILD_DIR
 cd $BUILD_DIR
 
-scan-build cmake $SOURCE_DIR -DCMAKE_BUILD_TYPE=Debug \
- -DWL_PORTABLE=true 
-
+scan-build cmake $SOURCE_DIR -DCMAKE_BUILD_TYPE=Debug
 scan-build make
 
 #The output is stored in /tmp, doesn't need the actual build