[sword-svn] r3279 - branches/sword-1-7-x

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2014-12-02 23:02:45 -0700 (Tue, 02 Dec 2014)
New Revision: 3279

Modified:
   branches/sword-1-7-x/
   branches/sword-1-7-x/CMakeLists.txt
Log:
Merging r3236



Property changes on: branches/sword-1-7-x
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:2989-2991,2997,3001-3004,3006,3010-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104,3106-3108,3110,3115,3118-3121,3126-3127,3131-3135,3140,3144,3151,3153-3155,3190-3192,3198-3199,3202-3203,3225,3230,3232-3234
   + /trunk:2989-2991,2997,3001-3004,3006,3010-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104,3106-3108,3110,3115,3118-3121,3126-3127,3131-3135,3140,3144,3151,3153-3155,3190-3192,3198-3199,3202-3203,3225,3230,3232-3234,3236

Modified: branches/sword-1-7-x/CMakeLists.txt
===================================================================
--- branches/sword-1-7-x/CMakeLists.txt	2014-12-03 06:02:12 UTC (rev 3278)
+++ branches/sword-1-7-x/CMakeLists.txt	2014-12-03 06:02:45 UTC (rev 3279)
@@ -1,5 +1,11 @@
 # TODO: write FindICU (icu-config only for 2.2 and up) -- currently taken from another CMake system
 #       limit pkg-config version to >= 0.14, demo, utilities, doc, tests
+#       use SYSCONF_INSTALL_DIR
+#       use LIB_INSTALL_DIR
+#       use INCLUDE_INSTALL_DIR
+#       use BUILD_SHARED_LIBS
+#       actually install sword.conf when asked
+#       convince perl swig bindings to build properly
 #
 # NOTES: Defaults to build type of Shared
 #        Forces out-of-source tree build