Skip to content
Snippets Groups Projects
Commit 02bc621b authored by unknown's avatar unknown
Browse files

mingw build fixes

parent 7fc0ba0e
Branches
No related merge requests found
...@@ -90,11 +90,11 @@ if(WIN32) ...@@ -90,11 +90,11 @@ if(WIN32)
# by default. # by default.
# For UNIX on the other hand everything is exported by default. # For UNIX on the other hand everything is exported by default.
# Until external API is specified explicitly, build STATIC for WIN32 # Until external API is specified explicitly, build STATIC for WIN32
add_library(corpus2 STATIC ${libcorpus2_STAT_SRC} ${INCS}) add_library(corpus2 SHARED ${libcorpus2_STAT_SRC} ${INCS})
else(WIN32) else(WIN32)
add_library(corpus2 SHARED ${libcorpus2_STAT_SRC} ${INCS}) add_library(corpus2 SHARED ${libcorpus2_STAT_SRC} ${INCS})
endif(WIN32) endif(WIN32)
target_link_libraries(corpus2 ${LIBS}) target_link_libraries(corpus2 pwrutils ${LIBS})
set_target_properties(corpus2 PROPERTIES set_target_properties(corpus2 PROPERTIES
VERSION "${corpus2_ver_major}.${corpus2_ver_minor}" VERSION "${corpus2_ver_major}.${corpus2_ver_minor}"
SOVERSION ${corpus2_ver_major}) SOVERSION ${corpus2_ver_major})
......
...@@ -3,6 +3,9 @@ PROJECT(corpus2_whole) ...@@ -3,6 +3,9 @@ PROJECT(corpus2_whole)
find_package(LibXML++ REQUIRED QUIET) find_package(LibXML++ REQUIRED QUIET)
include_directories(${LibXML++_INCLUDE_DIRS}) include_directories(${LibXML++_INCLUDE_DIRS})
include_directories(${Boost_INCLUDE_DIRS}) include_directories(${Boost_INCLUDE_DIRS})
link_directories(${ICU_LIBRARY_DIRS})
link_directories(${Boost_LIBRARY_DIRS})
include_directories(${ICU_INCLUDE_DIR})
link_directories(${LibXML++_LIBRARY_DIRS}) link_directories(${LibXML++_LIBRARY_DIRS})
set(LIBS ${LIBS} ${LibXML++_LIBRARIES}) set(LIBS ${LIBS} ${LibXML++_LIBRARIES})
...@@ -30,7 +33,7 @@ endif(CORPUS2_BUILD_POLIQARP) ...@@ -30,7 +33,7 @@ endif(CORPUS2_BUILD_POLIQARP)
file(GLOB_RECURSE INCS "*.h") file(GLOB_RECURSE INCS "*.h")
if(WIN32) if(WIN32)
add_library(corpus2_whole STATIC ${libcorpus2_whole_SRC} ${INCS}) add_library(corpus2_whole SHARED ${libcorpus2_whole_SRC} ${INCS})
else(WIN32) else(WIN32)
add_library(corpus2_whole SHARED ${libcorpus2_whole_SRC} ${INCS}) add_library(corpus2_whole SHARED ${libcorpus2_whole_SRC} ${INCS})
endif(WIN32) endif(WIN32)
......
...@@ -43,7 +43,7 @@ if(WIN32) ...@@ -43,7 +43,7 @@ if(WIN32)
# by default. # by default.
# For UNIX on the other hand everything is exported by default. # For UNIX on the other hand everything is exported by default.
# Until external API is specified explicitly, build STATIC for WIN32 # Until external API is specified explicitly, build STATIC for WIN32
add_library(pwrutils STATIC ${libpwrutils_STAT_SRC} ${INCS}) add_library(pwrutils SHARED ${libpwrutils_STAT_SRC} ${INCS})
else(WIN32) else(WIN32)
add_library(pwrutils SHARED ${libpwrutils_STAT_SRC} ${INCS}) add_library(pwrutils SHARED ${libpwrutils_STAT_SRC} ${INCS})
endif(WIN32) endif(WIN32)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment