[certi-cvs] applications/PyHLA CMakeLists.txt hla/CMakeList...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    applications
Changes by:     Petr Gotthard <gotthardp>       08/10/03 15:02:23

Modified files:
        PyHLA          : CMakeLists.txt 
        PyHLA/hla      : CMakeLists.txt 
        PyHLA/hla/_omt : CMakeLists.txt 
        PyHLA/hla/_rti : CMakeLists.txt 
        PyHLA/hla/omt  : CMakeLists.txt 
        PyHLA/hla/rti  : CMakeLists.txt 

Log message:
        Bugfixes for Windows installer.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/applications/PyHLA/CMakeLists.txt?cvsroot=certi&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/applications/PyHLA/hla/CMakeLists.txt?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/applications/PyHLA/hla/_omt/CMakeLists.txt?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/applications/PyHLA/hla/_rti/CMakeLists.txt?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/applications/PyHLA/hla/omt/CMakeLists.txt?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/applications/PyHLA/hla/rti/CMakeLists.txt?cvsroot=certi&r1=1.1&r2=1.2

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/applications/PyHLA/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- CMakeLists.txt      3 Oct 2008 09:05:03 -0000       1.2
+++ CMakeLists.txt      3 Oct 2008 15:02:22 -0000       1.3
@@ -10,9 +10,13 @@
 FIND_PACKAGE(PythonInterp REQUIRED)
 EXEC_PROGRAM("${PYTHON_EXECUTABLE}"
     ARGS "-c \"from distutils.sysconfig import get_python_lib; print 
get_python_lib()\""
-    OUTPUT_VARIABLE SITE_PACKAGES)
-SET(SITE_PACKAGES "${SITE_PACKAGES}/hla")
-MESSAGE(STATUS "Python modules will be installed in: ${SITE_PACKAGES}")
+    OUTPUT_VARIABLE PYTHON_PACKAGES_PATH)
+
+# Use the PYTHON_PACKAGES_PATH as a default CMAKE_INSTALL_PREFIX
+IF (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    SET(CMAKE_INSTALL_PREFIX "${PYTHON_PACKAGES_PATH}")
+ENDIF (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+MESSAGE(STATUS "Python modules will be installed in: ${CMAKE_INSTALL_PREFIX}")
 
 ADD_SUBDIRECTORY(hla)
 
@@ -37,4 +41,4 @@
 
 INCLUDE(CPack)
 
-# $Id: CMakeLists.txt,v 1.2 2008/10/03 09:05:03 gotthardp Exp $
+# $Id: CMakeLists.txt,v 1.3 2008/10/03 15:02:22 gotthardp Exp $

Index: hla/CMakeLists.txt
===================================================================
RCS file: /sources/certi/applications/PyHLA/hla/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- hla/CMakeLists.txt  25 Sep 2008 17:17:30 -0000      1.1
+++ hla/CMakeLists.txt  3 Oct 2008 15:02:22 -0000       1.2
@@ -12,6 +12,6 @@
     __init__.py)
 
 INSTALL(FILES ${PYTHON_SOURCES}
-    DESTINATION ${SITE_PACKAGES})
+    DESTINATION hla)
 
-# $Id: CMakeLists.txt,v 1.1 2008/09/25 17:17:30 gotthardp Exp $
+# $Id: CMakeLists.txt,v 1.2 2008/10/03 15:02:22 gotthardp Exp $

Index: hla/_omt/CMakeLists.txt
===================================================================
RCS file: /sources/certi/applications/PyHLA/hla/_omt/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- hla/_omt/CMakeLists.txt     25 Sep 2008 17:17:31 -0000      1.1
+++ hla/_omt/CMakeLists.txt     3 Oct 2008 15:02:23 -0000       1.2
@@ -15,7 +15,8 @@
     ${PYTHON_LIBRARY})
 
 INSTALL(TARGETS _omt
-    LIBRARY DESTINATION ${SITE_PACKAGES}
-    ARCHIVE DESTINATION ${SITE_PACKAGES})
+    RUNTIME DESTINATION hla
+    LIBRARY DESTINATION hla
+    ARCHIVE DESTINATION hla)
 
-# $Id: CMakeLists.txt,v 1.1 2008/09/25 17:17:31 gotthardp Exp $
+# $Id: CMakeLists.txt,v 1.2 2008/10/03 15:02:23 gotthardp Exp $

Index: hla/_rti/CMakeLists.txt
===================================================================
RCS file: /sources/certi/applications/PyHLA/hla/_rti/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- hla/_rti/CMakeLists.txt     25 Sep 2008 17:17:34 -0000      1.1
+++ hla/_rti/CMakeLists.txt     3 Oct 2008 15:02:23 -0000       1.2
@@ -25,7 +25,8 @@
     ${RTI_LIBRARIES})
 
 INSTALL(TARGETS _rti
-    LIBRARY DESTINATION ${SITE_PACKAGES}
-    ARCHIVE DESTINATION ${SITE_PACKAGES})
+    RUNTIME DESTINATION hla
+    LIBRARY DESTINATION hla
+    ARCHIVE DESTINATION hla)
 
-# $Id: CMakeLists.txt,v 1.1 2008/09/25 17:17:34 gotthardp Exp $
+# $Id: CMakeLists.txt,v 1.2 2008/10/03 15:02:23 gotthardp Exp $

Index: hla/omt/CMakeLists.txt
===================================================================
RCS file: /sources/certi/applications/PyHLA/hla/omt/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- hla/omt/CMakeLists.txt      25 Sep 2008 17:17:41 -0000      1.1
+++ hla/omt/CMakeLists.txt      3 Oct 2008 15:02:23 -0000       1.2
@@ -5,6 +5,6 @@
     record.py)
 
 INSTALL(FILES ${PYTHON_SOURCES}
-    DESTINATION ${SITE_PACKAGES}/data)
+    DESTINATION hla/omt)
 
-# $Id: CMakeLists.txt,v 1.1 2008/09/25 17:17:41 gotthardp Exp $
+# $Id: CMakeLists.txt,v 1.2 2008/10/03 15:02:23 gotthardp Exp $

Index: hla/rti/CMakeLists.txt
===================================================================
RCS file: /sources/certi/applications/PyHLA/hla/rti/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- hla/rti/CMakeLists.txt      25 Sep 2008 17:17:46 -0000      1.1
+++ hla/rti/CMakeLists.txt      3 Oct 2008 15:02:23 -0000       1.2
@@ -2,6 +2,6 @@
     __init__.py)
 
 INSTALL(FILES ${PYTHON_SOURCES}
-    DESTINATION ${SITE_PACKAGES}/rti)
+    DESTINATION hla/rti)
 
-# $Id: CMakeLists.txt,v 1.1 2008/09/25 17:17:46 gotthardp Exp $
+# $Id: CMakeLists.txt,v 1.2 2008/10/03 15:02:23 gotthardp Exp $