Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openstructure
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
schwede
openstructure
Commits
83429666
Commit
83429666
authored
12 years ago
by
Andreas Schenk
Browse files
Options
Downloads
Patches
Plain Diff
fixed installing of ..._ui.py files
parent
35b61c6c
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cmake_support/OST.cmake
+4
-3
4 additions, 3 deletions
cmake_support/OST.cmake
with
4 additions
and
3 deletions
cmake_support/OST.cmake
+
4
−
3
View file @
83429666
...
...
@@ -437,7 +437,7 @@ endmacro()
# Calls pyuic on every input file. The resulting python files are stored in
# the variable with name out_files.
#-------------------------------------------------------------------------------
macro
(
ui_to_python LIBNAME STAGEDIR
)
macro
(
ui_to_python LIBNAME
PYMODDIR
STAGEDIR
)
set
(
_input_files
${
ARGN
}
)
add_custom_target
(
"
${
LIBNAME
}
_ui"
ALL
)
find_program
(
_PYUIC_EXECUTABLE
...
...
@@ -457,9 +457,10 @@ macro(ui_to_python LIBNAME STAGEDIR)
COMMAND
${
_PYUIC_EXECUTABLE
}
-o
${
_abs_out_file
}
${
_in_file
}
VERBATIM DEPENDS
${
input_file
}
)
list
(
APPEND
${
out_files
}
${
_abs_out_file
}
)
list
(
APPEND out_files
${
_abs_out_file
}
)
endforeach
()
compile_py_files
(
_
${
LIBNAME
}
${
STAGEDIR
}
${
out_files
}
)
install
(
FILES
${
out_files
}
DESTINATION
"
${
LIB_DIR
}
/
${
PYMODDIR
}
"
)
endmacro
()
#-------------------------------------------------------------------------------
...
...
@@ -574,7 +575,7 @@ macro(pymod)
# build ui files
#-----------------------------------------------------------------------------
if
(
_ARG_UI
)
ui_to_python
(
${
_LIB_NAME
}
${
PYMOD_STAGE_DIR
}
${
_ARG_UI
}
)
ui_to_python
(
${
_LIB_NAME
}
${
PYMOD_DIR
}
${
PYMOD_STAGE_DIR
}
${
_ARG_UI
}
)
endif
()
#-----------------------------------------------------------------------------
# compile python files
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment