Merge pull request libfann#14 from jschueller/master

Fix MinGW build.

CMakeLists.txt

@@ -7,6 +7,7 @@ SET(CMAKE_MODULE_PATH
 )
 
 SET(VERSION 2.2.0)
+option(BUILD_SHARED_LIBS "build shared/static libs" ON)
 
 INCLUDE(DefineInstallationPaths)
 

cmake/Modules/DefineInstallationPaths.cmake

@@ -1,4 +1,4 @@
-if (UNIX)
+if (UNIX OR MINGW)
     IF (NOT APPLICATION_NAME)
         MESSAGE(STATUS "${PROJECT_NAME} is used as APPLICATION_NAME")
         SET(APPLICATION_NAME ${PROJECT_NAME})
@@ -122,9 +122,9 @@ if (UNIX)
         CACHE PATH "The ${APPLICATION_NAME} info install dir (default prefix/info)"
         FORCE
     )
-endif (UNIX)
+endif ()
 
-if (WIN32)
+if (MSCV)
 	# Same same
 	SET(BIN_INSTALL_DIR .)
 	SET(SBIN_INSTALL_DIR .)
@@ -134,5 +134,5 @@ if (WIN32)
 	SET(ICON_INSTALL_DIR .)
 	SET(SOUND_INSTALL_DIR .)
 	SET(LOCALE_INSTALL_DIR lang)
-endif (WIN32)
+endif (MSCV)
 

src/CMakeLists.txt

@@ -11,10 +11,12 @@ SET(floatfann_LIB_SRCS
 floatfann.c
 )
 
-ADD_LIBRARY(floatfann SHARED ${floatfann_LIB_SRCS})
+ADD_LIBRARY(floatfann ${floatfann_LIB_SRCS})
 
 SET_TARGET_PROPERTIES(floatfann PROPERTIES VERSION ${VERSION} SOVERSION 2 )
-INSTALL(TARGETS floatfann DESTINATION ${LIB_INSTALL_DIR} )
+INSTALL(TARGETS floatfann LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+                          ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+                          RUNTIME DESTINATION ${BIN_INSTALL_DIR} )
 
 
 ########### next target ###############
@@ -23,10 +25,12 @@ SET(doublefann_LIB_SRCS
 doublefann.c
 )
 
-ADD_LIBRARY(doublefann SHARED ${doublefann_LIB_SRCS})
+ADD_LIBRARY(doublefann ${doublefann_LIB_SRCS})
 
 SET_TARGET_PROPERTIES(doublefann PROPERTIES VERSION ${VERSION} SOVERSION 2 )
-INSTALL(TARGETS doublefann DESTINATION ${LIB_INSTALL_DIR} )
+INSTALL(TARGETS doublefann LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+                           ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+                           RUNTIME DESTINATION ${BIN_INSTALL_DIR} )
 
 
 ########### next target ###############
@@ -35,10 +39,12 @@ SET(fixedfann_LIB_SRCS
 fixedfann.c
 )
 
-ADD_LIBRARY(fixedfann SHARED ${fixedfann_LIB_SRCS})
+ADD_LIBRARY(fixedfann ${fixedfann_LIB_SRCS})
 
 SET_TARGET_PROPERTIES(fixedfann PROPERTIES VERSION ${VERSION} SOVERSION 2 )
-INSTALL(TARGETS fixedfann DESTINATION ${LIB_INSTALL_DIR} )
+INSTALL(TARGETS fixedfann LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+                          ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+                          RUNTIME DESTINATION ${BIN_INSTALL_DIR} )
 
 
 ########### next target ###############
@@ -47,8 +53,10 @@ SET(fann_LIB_SRCS
 floatfann.c
 )
 
-ADD_LIBRARY(fann SHARED ${fann_LIB_SRCS})
+ADD_LIBRARY(fann ${fann_LIB_SRCS})
 
 SET_TARGET_PROPERTIES(fann PROPERTIES VERSION ${VERSION} SOVERSION 2 )
-INSTALL(TARGETS fann DESTINATION ${LIB_INSTALL_DIR} )
+INSTALL(TARGETS fann LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+                     ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+                     RUNTIME DESTINATION ${BIN_INSTALL_DIR} )