Skip to content

Commit

Permalink
Also add win32 as a possible build target, update ignore lists
Browse files Browse the repository at this point in the history
This gets the CMake Visual Studio generator working properly and ensures that the build targets don't wind up getting accidentally committed.
  • Loading branch information
codemercenary committed Aug 4, 2015
1 parent 0e6fa25 commit 6f3899f
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,8 @@ install_manifest.txt
/bin/scaling_testd.exe
/bin/scaling_traind.exe
/bin/steepness_traind.exe
/bin/xor_cpp_sampled.exe
/bin/xor_cpp_sampled.exe
*.sln
*.suo
*.filters
*.vcxproj
2 changes: 1 addition & 1 deletion cmake/Modules/DefineInstallationPaths.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
if (UNIX OR MINGW)
if (UNIX OR MINGW OR WIN32)
IF (NOT APPLICATION_NAME)
MESSAGE(STATUS "${PROJECT_NAME} is used as APPLICATION_NAME")
SET(APPLICATION_NAME ${PROJECT_NAME})
Expand Down
8 changes: 6 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ fixedfann.c

ADD_LIBRARY(fixedfann ${fixedfann_LIB_SRCS})

TARGET_LINK_LIBRARIES(fixedfann m)
if(NOT WIN32)
TARGET_LINK_LIBRARIES(fixedfann m)
endif()

SET_TARGET_PROPERTIES(fixedfann PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR})
INSTALL(TARGETS fixedfann LIBRARY DESTINATION ${LIB_INSTALL_DIR}
Expand All @@ -57,7 +59,9 @@ floatfann.c

ADD_LIBRARY(fann ${fann_LIB_SRCS})

TARGET_LINK_LIBRARIES(fann m)
if(NOT WIN32)
TARGET_LINK_LIBRARIES(fann m)
endif()

SET_TARGET_PROPERTIES(fann PROPERTIES VERSION ${FANN_VERSION_STRING} SOVERSION ${FANN_VERSION_MAJOR})
INSTALL(TARGETS fann LIBRARY DESTINATION ${LIB_INSTALL_DIR}
Expand Down

0 comments on commit 6f3899f

Please sign in to comment.