Changeset 711

Timestamp:

08/21/07 15:44:13 (12 months ago)

Author:

daelstorm

Message:

forgot setup's cmakelist, added pymucipher

Location:

museek+/trunk/sources

Files:

• CMakeLists.txt (modified) (4 diffs)
• PyMucipher/CMakeLists.txt (added)
• python-site-packages.py (modified) (1 diff)
• setup/CMakeLists.txt (added)

museek+/trunk/sources/CMakeLists.txt

@@ -10 +10 @@
 include(CheckCXXSourceCompiles)
 SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
-MESSAGE("DECLARATIONS: PREFIX, EVERYTHING, NO_MUSEEKD, NO_MUSCAN, NO_SETUP, BINDINGS, MURMUR, MUCOUS, CLIENTS, SETUP
+MESSAGE("DECLARATIONS: PREFIX, EVERYTHING, NO_MUSEEKD, NO_MUSCAN, NO_SETUP, NO_PYMUCIPHER, BINDINGS, MURMUR, MUCOUS, CLIENTS, SETUP
 Prefix declarations with -D and set them with either 1, 0 or a path.
 Set -DEVERYTHING=1 if you want it all")
@@ -52 +52 @@
 ENDIF (NO_MUSCAN)
 
+set(PYMUCIPHER 1)
+IF (NO_PYMUCIPHER)
+  set(PYMUCIPHER 0)
+ENDIF (NO_PYMUCIPHER)
+        
 set(PYSETUP 1)
 IF (NO_SETUP)
@@ -58 +63 @@
 
 IF (EVERYTHING)
+  set(PYMUCIPHER 1)
   set(PYBIND 1)
   set(PYCLIENTS 1)
@@ -266 +272 @@
 
 add_subdirectory(Mucipher)
+if (PYMUCIPHER)
+  add_subdirectory(PyMucipher)
+else (PYMUCIPHER)
+  MESSAGE("!!! PyMucipher will NOT be installed.. [NO_PYMUCIPHER=0]")
+endif (PYMUCIPHER)
 if (C_MUSCAN)
   add_subdirectory(Muhelp)

museek+/trunk/sources/python-site-packages.py

@@ -1 +1 @@
 #!/usr/bin/env python
 import os, sys
-print os.path.join("lib", "python" + str(sys.version_info[0]) + "." + str(sys.version_info[1]), "site-packages", sys.argv[1]),
+list1 = os.path.join("lib", "python" + str(sys.version_info[0]) + "." + str(sys.version_info[1]), "site-packages")
+if len(sys.argv) > 1:
+    list1 = os.path.join(list1, sys.arv[1:])
+
+print list1