[Clucene-cvs] SF.net SVN: clucene:[2906] branches/lucene2_3_2

[<ust...@us...>]

Revision: 2906
          http://clucene.svn.sourceforge.net/clucene/?rev=2906&view=rev
Author:   ustramooner
Date:     2008-09-30 14:54:57 +0000 (Tue, 30 Sep 2008)

Log Message:
-----------
don't build static libraries by default. this is probably not necessary by default.

Modified Paths:
--------------
    branches/lucene2_3_2/CMakeLists.txt
    branches/lucene2_3_2/src/contribs/CMakeLists.txt
    branches/lucene2_3_2/src/core/CMakeLists.txt
    branches/lucene2_3_2/src/shared/CMakeLists.txt

Modified: branches/lucene2_3_2/CMakeLists.txt
===================================================================
--- branches/lucene2_3_2/CMakeLists.txt	2008-09-27 11:05:20 UTC (rev 2905)
+++ branches/lucene2_3_2/CMakeLists.txt	2008-09-30 14:54:57 UTC (rev 2906)
@@ -59,6 +59,9 @@
 OPTION(ENABLE_PACKAGING
   "create build scripts for creating clucene packages"
   OFF)
+OPTION(BUILD_STATIC_LIBRARIES
+  "create targets for building static libraries"
+  OFF)
 
 OPTION(LUCENE_SYS_INCLUDES
   "location for non-system independent files. defaults to CMAKE_INSTALL_PREFIX. see INSTALL documentation for further information."

Modified: branches/lucene2_3_2/src/contribs/CMakeLists.txt
===================================================================
--- branches/lucene2_3_2/src/contribs/CMakeLists.txt	2008-09-27 11:05:20 UTC (rev 2905)
+++ branches/lucene2_3_2/src/contribs/CMakeLists.txt	2008-09-30 14:54:57 UTC (rev 2906)
@@ -37,7 +37,6 @@
     ./CLucene/jstreams/fileinputstream.cpp
     ./CLucene/jstreams/subinputstream.cpp
     ./CLucene/jstreams/tarinputstream.cpp
-    ./CLucene/jstreams/zipinputstream.cpp
     
     ./CLucene/highlighter/Encoder.cpp
     ./CLucene/highlighter/Formatter.cpp
@@ -104,6 +103,7 @@
     SET ( clucene_contribs_Files ${clucene_contribs_Files}
         ./CLucene/jstreams/gzipcompressstream.cpp
         ./CLucene/jstreams/gzipinputstream.cpp
+		./CLucene/jstreams/zipinputstream.cpp
     )
     INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
     SET ( clucene-contrib-libs "${clucene-contrib-libs} ${ZLIB_LIBRARIES}" )
@@ -130,8 +130,8 @@
 
 #create the libraries
 INCLUDE_DIRECTORIES( ${clucene_SOURCE_DIR}/src/core )
-INCLUDE_DIRECTORIES( ${clucene_SOURCE_DIR}/src/contribs )
-INCLUDE_DIRECTORIES( ${clucene_BINARY_DIR}/src/contribs )
+INCLUDE_DIRECTORIES( ${clucene_SOURCE_DIR}/src/contribs-lib )
+INCLUDE_DIRECTORIES( ${clucene_BINARY_DIR}/src/contribs-lib )
 
 add_library(clucene-contribs SHARED
 	${clucene_contribs_Files} ${clucene_shared_Files} ${HEADERS}
@@ -140,11 +140,6 @@
     TARGET_LINK_LIBRARIES(clucene-contribs clucene-shared)
 ENDIF ( NOT USE_SHARED_OBJECT_FILES )
 
-add_library(clucene-contribs-static STATIC
-	${clucene_contribs_Files} ${clucene_shared_Files} ${HEADERS}
-)
-
-
 #set properties on the libraries
 SET_TARGET_PROPERTIES(clucene-contribs PROPERTIES
     VERSION ${CLUCENE_VERSION}
@@ -152,8 +147,14 @@
     COMPILE_DEFINITIONS_DEBUG _DEBUG
 )
 
-SET_TARGET_PROPERTIES(clucene-contribs-static PROPERTIES
-    VERSION ${CLUCENE_VERSION}
-    SOVERSION ${CLUCENE_SOVERSION}
-    COMPILE_DEFINITIONS_DEBUG _DEBUG
-)
+IF ( BUILD_STATIC_LIBRARIES )
+	add_library(clucene-contribs-static STATIC
+		${clucene_contribs_Files} ${clucene_shared_Files} ${HEADERS}
+	)
+	
+	SET_TARGET_PROPERTIES(clucene-contribs-static PROPERTIES
+	    VERSION ${CLUCENE_VERSION}
+	    SOVERSION ${CLUCENE_SOVERSION}
+	    COMPILE_DEFINITIONS_DEBUG _DEBUG
+	)
+ENDIF ( BUILD_STATIC_LIBRARIES )

Modified: branches/lucene2_3_2/src/core/CMakeLists.txt
===================================================================
--- branches/lucene2_3_2/src/core/CMakeLists.txt	2008-09-27 11:05:20 UTC (rev 2905)
+++ branches/lucene2_3_2/src/core/CMakeLists.txt	2008-09-30 14:54:57 UTC (rev 2906)
@@ -27,7 +27,7 @@
 	./CLucene/util/fileinputstream.cpp
 	./CLucene/util/MD5Digester.cpp
 	./CLucene/util/StringIntern.cpp
-	./CLucene/util/subinputstream.cpp
+#	./CLucene/util/subinputstream.cpp
 	./CLucene/util/BitSet.cpp
 	./CLucene/queryParser/Lexer.cpp
 	./CLucene/queryParser/MultiFieldQueryParser.cpp
@@ -138,10 +138,6 @@
 	${clucene_core_Files} ${clucene_shared_Files} ${HEADERS}
 )
 
-add_library(clucene-core-static STATIC
-	${clucene_core_Files} ${clucene_shared_Files} ${HEADERS}
-)
-
 #set properties on the libraries
 SET_TARGET_PROPERTIES(clucene-core PROPERTIES
     VERSION ${CLUCENE_VERSION}
@@ -154,12 +150,24 @@
     TARGET_LINK_LIBRARIES(clucene-core clucene-shared)
 ENDIF ( NOT USE_SHARED_OBJECT_FILES )
 
-SET_TARGET_PROPERTIES(clucene-core-static PROPERTIES
-    VERSION ${CLUCENE_VERSION}
-    SOVERSION ${CLUCENE_SOVERSION}
-    COMPILE_DEFINITIONS_DEBUG _DEBUG
-)
 
+IF ( BUILD_STATIC_LIBRARIES )
+	add_library(clucene-core-static STATIC
+		${clucene_core_Files} ${clucene_shared_Files} ${HEADERS}
+	)
+	
+	SET_TARGET_PROPERTIES(clucene-core-static PROPERTIES
+	    VERSION ${CLUCENE_VERSION}
+	    SOVERSION ${CLUCENE_SOVERSION}
+	    COMPILE_DEFINITIONS_DEBUG _DEBUG
+	)
+	
+	#and install library
+	install(TARGETS clucene-core-static 
+	        DESTINATION lib 
+	        COMPONENT runtime )
+ENDIF ( BUILD_STATIC_LIBRARIES )
+
 #install public headers.
 FOREACH(file ${HEADERS})
 	get_filename_component(apath ${file} PATH)
@@ -209,10 +217,8 @@
             COMPONENT development)
 ENDIF ( LUCENE_SYS_INCLUDES )
 
-#and install libraries
+
+#and install library
 install(TARGETS clucene-core 
         DESTINATION lib  
         COMPONENT runtime )
-install(TARGETS clucene-core-static 
-        DESTINATION lib 
-        COMPONENT runtime )

Modified: branches/lucene2_3_2/src/shared/CMakeLists.txt
===================================================================
--- branches/lucene2_3_2/src/shared/CMakeLists.txt	2008-09-27 11:05:20 UTC (rev 2905)
+++ branches/lucene2_3_2/src/shared/CMakeLists.txt	2008-09-30 14:54:57 UTC (rev 2906)
@@ -291,9 +291,6 @@
 add_library(clucene-shared SHARED
 	${clucene_shared_Files} ${HEADERS}
 )
-add_library(clucene-shared-static STATIC
-	${clucene_shared_Files} ${HEADERS}
-)
 
 #set properties on the libraries
 SET_TARGET_PROPERTIES(clucene-shared PROPERTIES
@@ -301,15 +298,23 @@
     SOVERSION ${CLUCENE_SOVERSION}
     COMPILE_DEFINITIONS_DEBUG _DEBUG
 )
-SET_TARGET_PROPERTIES(clucene-shared-static PROPERTIES
-    VERSION ${CLUCENE_VERSION}
-    SOVERSION ${CLUCENE_SOVERSION}
-    COMPILE_DEFINITIONS_DEBUG _DEBUG
-)
 
 install(TARGETS clucene-shared 
         DESTINATION lib 
         COMPONENT development )
-install(TARGETS clucene-shared-static 
-        DESTINATION lib 
-        COMPONENT runtime )
+        
+
+IF ( BUILD_STATIC_LIBRARIES )
+	add_library(clucene-shared-static STATIC
+		${clucene_shared_Files} ${HEADERS}
+	)
+	
+	SET_TARGET_PROPERTIES(clucene-shared-static PROPERTIES
+	    VERSION ${CLUCENE_VERSION}
+	    SOVERSION ${CLUCENE_SOVERSION}
+	    COMPILE_DEFINITIONS_DEBUG _DEBUG
+	)
+	install(TARGETS clucene-shared-static 
+	        DESTINATION lib 
+	        COMPONENT runtime )
+ENDIF ( BUILD_STATIC_LIBRARIES )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.