[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/work/kst/portto4/kst/cmake
From: Peter Kümmel <syntheticpp () gmx ! net>
Date: 2010-12-06 20:38:03
Message-ID: 20101206203803.534CBAC8A5 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1204346 by kuemmel:
cmake: add option to rebuild generated files
M +2 -1 CMakeLists.txt
M +3 -1 modules/KstMacros.cmake
M +1 -1 modules/MergedFilesBuild.cmake
--- branches/work/kst/portto4/kst/cmake/CMakeLists.txt #1204345:1204346
@@ -8,7 +8,8 @@
message(STATUS "")
message(STATUS "Build options:")
message(STATUS "")
-kst_option(merge_files "Merge files to speedup build" OFFS all)
+kst_option(merge_files "Merge files to speedup build" OFF all)
+kst_option(merge_rebuild "Rebuild generated files from merged files build" OFF all)
message(STATUS "")
find_package(Qt4 REQUIRED)
--- branches/work/kst/portto4/kst/cmake/modules/KstMacros.cmake #1204345:1204346
@@ -46,7 +46,9 @@
string(TOUPPER BUILD_${kst_name} _build_macro)
add_definitions(-D${_build_macro})
if(kst_merge_files)
- set(merge_rebuild 0)
+ if(kst_merge_rebuild)
+ set(merged_files_rebuild 0)
+ endif()
foreach(_it ${kst_${kst_name}_dont_merge})
list(REMOVE_ITEM kst_${kst_name}_sources ${_it})
endforeach()
--- branches/work/kst/portto4/kst/cmake/modules/MergedFilesBuild.cmake #1204345:1204346
@@ -27,7 +27,7 @@
endif()
endif()
- if (merge_rebuild)
+ if (merged_files_rebuild)
set(_rebuild_file_const 1)
set(_rebuild_file_touched 1)
endif()
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic