diff --git a/cmake/Modules/DefineInstallationPaths.cmake b/cmake/Modules/DefineInstallationPaths.cmake index 644cf1b..81e7c74 100644 --- a/cmake/Modules/DefineInstallationPaths.cmake +++ b/cmake/Modules/DefineInstallationPaths.cmake @@ -3,7 +3,7 @@ if (UNIX) MESSAGE(STATUS "${PROJECT_NAME} is used as APPLICATION_NAME") SET(APPLICATION_NAME ${PROJECT_NAME}) ENDIF (NOT APPLICATION_NAME) - +if (0) # Suffix for Linux SET(LIB_SUFFIX CACHE STRING "Define suffix of directory name (32/64)" @@ -122,9 +122,10 @@ if (UNIX) CACHE PATH "The ${APPLICATION_NAME} info install dir (default prefix/info)" FORCE ) +endif() endif (UNIX) -if (WIN32) +if (0) # Same same SET(BIN_INSTALL_DIR .) SET(SBIN_INSTALL_DIR .) @@ -134,5 +135,5 @@ if (WIN32) SET(ICON_INSTALL_DIR .) SET(SOUND_INSTALL_DIR .) SET(LOCALE_INSTALL_DIR lang) -endif (WIN32) +endif (0) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fade00c..a4e6c3f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,7 +14,7 @@ floatfann.c ADD_LIBRARY(floatfann SHARED ${floatfann_LIB_SRCS}) SET_TARGET_PROPERTIES(floatfann PROPERTIES VERSION ${VERSION} SOVERSION 2 ) -INSTALL(TARGETS floatfann DESTINATION ${LIB_INSTALL_DIR} ) +INSTALL(TARGETS floatfann RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) ########### next target ############### @@ -26,7 +26,7 @@ doublefann.c ADD_LIBRARY(doublefann SHARED ${doublefann_LIB_SRCS}) SET_TARGET_PROPERTIES(doublefann PROPERTIES VERSION ${VERSION} SOVERSION 2 ) -INSTALL(TARGETS doublefann DESTINATION ${LIB_INSTALL_DIR} ) +INSTALL(TARGETS doublefann RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) ########### next target ############### @@ -38,7 +38,7 @@ fixedfann.c ADD_LIBRARY(fixedfann SHARED ${fixedfann_LIB_SRCS}) SET_TARGET_PROPERTIES(fixedfann PROPERTIES VERSION ${VERSION} SOVERSION 2 ) -INSTALL(TARGETS fixedfann DESTINATION ${LIB_INSTALL_DIR} ) +INSTALL(TARGETS fixedfann RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) ########### next target ############### @@ -50,5 +50,5 @@ floatfann.c ADD_LIBRARY(fann SHARED ${fann_LIB_SRCS}) SET_TARGET_PROPERTIES(fann PROPERTIES VERSION ${VERSION} SOVERSION 2 ) -INSTALL(TARGETS fann DESTINATION ${LIB_INSTALL_DIR} ) +INSTALL(TARGETS fann RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib )