File fix-build.diff of Package mingw32-lucene++

Overview Repositories Revisions Requests Users Attributes Meta

File fix-build.diff of Package mingw32-lucene++ (Revision 41b8a346edbc17f3f7ec72f59a669dd9)

Currently displaying revision 41b8a346edbc17f3f7ec72f59a669dd9 , Show latest

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96183e3..768b208 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,10 @@ option(ENABLE_CYCLIC_CHECK
   "Enable cyclic checking"
   OFF
 )
+option(ENABLE_TEST
+  "Enable the tests"
+  ON
+)
 
 ####################################
 # bootstrap
@@ -93,7 +97,7 @@ if(WIN32 OR WIN64)
   set(CMAKE_DEBUG_POSTFIX "d")
 endif()
 
-if(NOT MSVC AND NOT CMAKE_SYSTEM MATCHES "SunOS-5*.")
+if(NOT WIN32 AND NOT CMAKE_SYSTEM MATCHES "SunOS-5*.")
   add_definitions(-fPIC)
 endif()
 
@@ -113,12 +117,15 @@ include_directories(
   "${CMAKE_CURRENT_BINARY_DIR}/include"
 )
 
-enable_testing()
 
 add_subdirectory(src/core)
 add_subdirectory(src/contrib)
 add_subdirectory(src/demo)
-add_subdirectory(src/test)
+
+if(ENABLE_TEST)
+  enable_testing()
+  add_subdirectory(src/test)
+endif()
 
 #################################
 # install pkg-config file
diff --git a/src/contrib/CMakeLists.txt b/src/contrib/CMakeLists.txt
index 76f81e3..2579496 100644
--- a/src/contrib/CMakeLists.txt
+++ b/src/contrib/CMakeLists.txt
@@ -53,6 +53,8 @@ target_link_libraries(lucene++-contrib
 cotire(lucene++-contrib)
 
 install(TARGETS lucene++-contrib
-  DESTINATION "${LIB_DESTINATION}"
+  ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
   COMPONENT runtime
 )
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 7d6153d..9fd287d 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -34,6 +34,10 @@ target_link_libraries(lucene++
   ${lucene_boost_libs}
 )
 
+if(WIN32)
+    target_link_libraries(lucene++ ws2_32)
+endif()
+
 set_target_properties(lucene++ PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "include/LuceneInc.h")
 cotire(lucene++)
 
@@ -48,6 +52,8 @@ install(FILES ${lucene_headers}
 )
 
 install(TARGETS lucene++
-  DESTINATION "${LIB_DESTINATION}"
+  ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
   COMPONENT runtime
 )
diff --git a/src/core/include/LuceneInc.h b/src/core/include/LuceneInc.h
index 1fbee3a..a099919 100644
--- a/src/core/include/LuceneInc.h
+++ b/src/core/include/LuceneInc.h
@@ -9,7 +9,9 @@
 #include "targetver.h"
 
 #define WIN32_LEAN_AND_MEAN
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 
 #include <windows.h>

Places

File fix-build.diff of Package mingw32-lucene++ (Revision 41b8a346edbc17f3f7ec72f59a669dd9)

Places