find libyui in a prefix outside /usr

and let the sources use the yui/ directory part consistently: swig/yui.i used #include "yui/foo" but %include foo
libyui · Feb 21, 2014 · d3da730 · d3da730
1 parent 369f2d3
commit d3da730
Show file tree

Hide file tree

Showing 3 changed files with 92 additions and 87 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,7 +19,11 @@ INCLUDE(${CMAKE_SOURCE_DIR}/VERSION.cmake)
 SET( PACKAGE "libyui-bindings" )
 SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
 
-SET( LIBYUI_INCLUDE_DIR "/usr/include/yui" )
+IF( NOT PREFIX )
+  SET( PREFIX "/usr" )
+ENDIF()
+
+SET( LIBYUI_INCLUDE_DIR "${PREFIX}/include" )
 SET( LIBYUI_LIBRARY "yui" )
 
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Language Bindings for libyui")

diff --git a/libyui-bindings.spec.cmake b/libyui-bindings.spec.cmake
@@ -55,7 +55,8 @@ Authors:
 %build
 mkdir build
 cd build
-cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \
+cmake -DPREFIX=%{prefix} \
+      -DCMAKE_INSTALL_PREFIX=%{prefix} \
       -DLIB=%{_lib} \
       -DPYTHON_SITEDIR=%{py_sitedir} \
       -DCMAKE_VERBOSE_MAKEFILE=TRUE \

diff --git a/swig/yui.i b/swig/yui.i
@@ -136,7 +136,7 @@ class intrusive_ptr {
 %include "stl.i"
 
 class Exception;
-%include YUI.h
+%include yui/YUI.h
 
 %define YUILogComponent "bindings"
 %enddef
@@ -167,90 +167,90 @@ class Exception;
 %apply SWIGTYPE *DISOWN { YTableHeader *header_disown };
 %apply SWIGTYPE *DISOWN { YWidget *parent_disown };
 
-%include YUILog.h
-%include YUIPlugin.h
-
-%include YTypes.h
-%include YWidget.h
-%include YSingleChildContainerWidget.h
-%include YSelectionWidget.h
-%include YSimpleInputField.h
-%include YItem.h
-%include YTreeItem.h
-%include YStringTree.h
-
-%include YWidgetFactory.h
-
-%include YDialog.h
-
-%include YAlignment.h
-%include YApplication.h
-%include YBarGraph.h
-%include YBothDim.h
-%include YBuiltinCaller.h
-%include YBusyIndicator.h
-%include YCheckBoxFrame.h
-%include YCheckBox.h
-%include YChildrenManager.h
-%include YColor.h
-%include YComboBox.h
-%include YCommandLine.h
-%include YDateField.h
-%include YDownloadProgress.h
-%include YDumbTab.h
-%include YEmpty.h
-%include YEvent.h
-%include YFrame.h
-%include YImage.h
-%include YInputField.h
-%include YIntField.h
-%include YLabel.h
-%include YLayoutBox.h
-%include YLogView.h
-%include YMacro.h
-%include YMacroPlayer.h
-%include YMacroRecorder.h
-%include YMenuButton.h
-%include YMenuItem.h
-%include YMultiLineEdit.h
-%include YMultiProgressMeter.h
-%include YMultiSelectionBox.h
-%include YOptionalWidgetFactory.h
-%include YPackageSelector.h
-%include YPackageSelectorPlugin.h
-%include YPartitionSplitter.h
-%include YProgressBar.h
-%include YProperty.h
-%include YPushButton.h
-%include YRadioButtonGroup.h
-%include YRadioButton.h
-%include YReplacePoint.h
-%include YRichText.h
-%include YRpmGroupsTree.h
-%include YSelectionBox.h
-%include YSettings.h
-%include YShortcut.h
-%include YShortcutManager.h
-%include YSimpleEventHandler.h
-%include YSlider.h
-%include YSpacing.h
-%include YSquash.h
-%include YTable.h
-%include YTableHeader.h
-%include YTableItem.h
-%include YTimeField.h
-%include YTimezoneSelector.h
-%include YTransText.h
-%include YTree.h
-%include YUIException.h
-%include YUI.h
-%include YUILoader.h
-%include YUILog.h
-%include YUISymbols.h
-%include YWidgetID.h
-%include YWizard.h
-%include YExternalWidgetFactory.h
-%include YExternalWidgets.h
+%include yui/YUILog.h
+%include yui/YUIPlugin.h
+
+%include yui/YTypes.h
+%include yui/YWidget.h
+%include yui/YSingleChildContainerWidget.h
+%include yui/YSelectionWidget.h
+%include yui/YSimpleInputField.h
+%include yui/YItem.h
+%include yui/YTreeItem.h
+%include yui/YStringTree.h
+
+%include yui/YWidgetFactory.h
+
+%include yui/YDialog.h
+
+%include yui/YAlignment.h
+%include yui/YApplication.h
+%include yui/YBarGraph.h
+%include yui/YBothDim.h
+%include yui/YBuiltinCaller.h
+%include yui/YBusyIndicator.h
+%include yui/YCheckBoxFrame.h
+%include yui/YCheckBox.h
+%include yui/YChildrenManager.h
+%include yui/YColor.h
+%include yui/YComboBox.h
+%include yui/YCommandLine.h
+%include yui/YDateField.h
+%include yui/YDownloadProgress.h
+%include yui/YDumbTab.h
+%include yui/YEmpty.h
+%include yui/YEvent.h
+%include yui/YFrame.h
+%include yui/YImage.h
+%include yui/YInputField.h
+%include yui/YIntField.h
+%include yui/YLabel.h
+%include yui/YLayoutBox.h
+%include yui/YLogView.h
+%include yui/YMacro.h
+%include yui/YMacroPlayer.h
+%include yui/YMacroRecorder.h
+%include yui/YMenuButton.h
+%include yui/YMenuItem.h
+%include yui/YMultiLineEdit.h
+%include yui/YMultiProgressMeter.h
+%include yui/YMultiSelectionBox.h
+%include yui/YOptionalWidgetFactory.h
+%include yui/YPackageSelector.h
+%include yui/YPackageSelectorPlugin.h
+%include yui/YPartitionSplitter.h
+%include yui/YProgressBar.h
+%include yui/YProperty.h
+%include yui/YPushButton.h
+%include yui/YRadioButtonGroup.h
+%include yui/YRadioButton.h
+%include yui/YReplacePoint.h
+%include yui/YRichText.h
+%include yui/YRpmGroupsTree.h
+%include yui/YSelectionBox.h
+%include yui/YSettings.h
+%include yui/YShortcut.h
+%include yui/YShortcutManager.h
+%include yui/YSimpleEventHandler.h
+%include yui/YSlider.h
+%include yui/YSpacing.h
+%include yui/YSquash.h
+%include yui/YTable.h
+%include yui/YTableHeader.h
+%include yui/YTableItem.h
+%include yui/YTimeField.h
+%include yui/YTimezoneSelector.h
+%include yui/YTransText.h
+%include yui/YTree.h
+%include yui/YUIException.h
+%include yui/YUI.h
+%include yui/YUILoader.h
+%include yui/YUILog.h
+%include yui/YUISymbols.h
+%include yui/YWidgetID.h
+%include yui/YWizard.h
+%include yui/YExternalWidgetFactory.h
+%include yui/YExternalWidgets.h
 
 
 #if defined(SWIGRUBY)