ritsu 0.6.1 → 0.6.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/VERSION +1 -1
- data/lib/ritsu/ext/qt/project.rb +21 -1
- data/lib/ritsu/ext/qt/src_files/target_cmake_lists.rb +1 -1
- metadata +3 -3
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.6.
|
1
|
+
0.6.2
|
data/lib/ritsu/ext/qt/project.rb
CHANGED
@@ -5,7 +5,27 @@ module Ritsu
|
|
5
5
|
def setup_qt
|
6
6
|
### Qt ###
|
7
7
|
add_external_library("qt") do |e|
|
8
|
-
e.cmake_find_script
|
8
|
+
e.cmake_find_script <<-QT_FIND_SCRIPT
|
9
|
+
|
10
|
+
FIND_PACKAGE(Qt4 REQUIRED)
|
11
|
+
|
12
|
+
MACRO (RITSU_QT4_WRAP_UI outfiles )
|
13
|
+
QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN})
|
14
|
+
|
15
|
+
FOREACH (it ${ui_files})
|
16
|
+
GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
|
17
|
+
GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
|
18
|
+
SET(outfile ${CMAKE_CURRENT_SOURCE_DIR}/ui_${outfile}.h)
|
19
|
+
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
|
20
|
+
COMMAND ${QT_UIC_EXECUTABLE}
|
21
|
+
ARGS ${ui_options} -o ${outfile} ${infile}
|
22
|
+
MAIN_DEPENDENCY ${infile})
|
23
|
+
SET(${outfiles} ${${outfiles}} ${outfile})
|
24
|
+
ENDFOREACH (it)
|
25
|
+
|
26
|
+
ENDMACRO (RITSU_QT4_WRAP_UI)
|
27
|
+
|
28
|
+
QT_FIND_SCRIPT
|
9
29
|
e.cmake_depend_script "INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR})"
|
10
30
|
e.cmake_name "${QT_QTCORE_LIBRARY}"
|
11
31
|
end
|
@@ -26,7 +26,7 @@ module Ritsu
|
|
26
26
|
end
|
27
27
|
ui_files.sort! {|x,y| x.src_path <=> y.src_path}
|
28
28
|
|
29
|
-
block.add_line "
|
29
|
+
block.add_line "RITSU_QT4_WRAP_UI(#{ui_header_files_var_name}"
|
30
30
|
block.indent
|
31
31
|
ui_files.each do |ui_file|
|
32
32
|
block.add_line("${CMAKE_SOURCE_DIR}/#{ui_file.src_path}")
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ritsu
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 3
|
5
5
|
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 6
|
9
|
-
-
|
10
|
-
version: 0.6.
|
9
|
+
- 2
|
10
|
+
version: 0.6.2
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- dragonmeteor
|