[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Closing python_scripting branch

[<hug...@li...>]

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/a36935eda2d9
changeset: 5219:a36935eda2d9
user:      tmodes
date:       Wed May 18 20:23:38 2011 +0200
description:
Closing python_scripting branch

diffstat:

 src/hugin1/calibrate_lens/CMakeLists.txt  |   4 ++++
 src/hugin_script_interface/CMakeLists.txt |  16 +++++-----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diffs (41 lines):

diff -r a4977f931f50 -r a36935eda2d9 src/hugin1/calibrate_lens/CMakeLists.txt
--- a/src/hugin1/calibrate_lens/CMakeLists.txt	Wed May 18 20:12:13 2011 +0200
+++ b/src/hugin1/calibrate_lens/CMakeLists.txt	Wed May 18 20:23:38 2011 +0200
@@ -12,3 +12,7 @@
 target_link_libraries(calibrate_lens_gui huginbasewx ${common_libs} ${image_libs} ${wxWidgets_LIBRARIES} huginlines)
 
 INSTALL(TARGETS calibrate_lens_gui DESTINATION ${BINDIR})
+IF(UNIX)
+    # install further stuff (icons etc.)
+    INSTALL(FILES calibrate_lens_gui.desktop DESTINATION ${DATADIR}/applications)
+ENDIF(UNIX)
diff -r a4977f931f50 -r a36935eda2d9 src/hugin_script_interface/CMakeLists.txt
--- a/src/hugin_script_interface/CMakeLists.txt	Wed May 18 20:12:13 2011 +0200
+++ b/src/hugin_script_interface/CMakeLists.txt	Wed May 18 20:23:38 2011 +0200
@@ -233,11 +233,10 @@
     INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/hsi.py DESTINATION ${BINDIR})
 
 
-ELSEIF(${HUGIN_LIBS_PRIVATE_DIR})
-    # Lukas says: I'd go for
-    # ${LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/hugin
-    # but on my system the proper destination seems to be this:
-
+ELSE()
+    # Linux/MacOS
+    # install python related files into correct destination depending on Python version
+    
     SET(PYINSTALLDIR
         ${LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/dist-packages
         )
@@ -255,9 +254,4 @@
             DESTINATION ${PYINSTALLDIR}
             )
 
-ELSE(WIN32)
-    # I suppose this is for Mac OS ?!
-    # INSTALL(TARGETS ${SWIG_MODULE_hsi_REAL_NAME} LIBRARY DESTINATION ${LIBDIR} NAMELINK_SKIP)
-    # INSTALL(FILES hpi.py DESTINATION ${LIBDIR})
-    # INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/hsi.py DESTINATION ${LIBDIR})
-ENDIF(WIN32)
+ENDIF()