summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRALOVICH, Kristof <tade60@freemail.hu>2013-06-25 13:26:53 +0200
committerRALOVICH, Kristof <tade60@freemail.hu>2013-06-25 13:26:53 +0200
commitae644b2363565b9419f89560109e4703b6987c68 (patch)
treea9b86c26512e4ff461a5ce93e0e08e74ebaa6391
parentf5a187ca07537d3bff27119cc58a1008236df0b2 (diff)
cmake: fix linking under win
-rw-r--r--src/CMakeLists.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8cbccc7..60fd191 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,6 +24,7 @@ IF(MSVC)
SET(BOOST_ROOT "${DEP_ROOT}\\boost_1_43_0" CACHE PATH "Boost PATH" )
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+ SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
ENDIF()
@@ -54,6 +55,8 @@ INCLUDE_DIRECTORIES(${LIBUSB_INCLUDE_DIRS})
LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
IF(MSVC)
+ ADD_DEFINITIONS(-D_CRT_NONSTDC_NO_WARNINGS)
+ #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:libboost_date_time-vc90-mt-s-1_43.lib /NODEFAULTLIB:libboost_thread-vc90-mt-s-1_43.lib /NODEFAULTLIB:libboost_program_options-vc90-mt-s-1_43.lib /NODEFAULTLIB:libboost_filesystem-vc90-mt-s-1_43.lib /NODEFAULTLIB:libboost_system-vc90-mt-s-1_43.lib")
ENDIF()
SET(SRCS
@@ -90,6 +93,7 @@ ADD_LIBRARY(antpm
${SRCS}
)
TARGET_LINK_LIBRARIES(antpm
+ ${Boost_DATE_TIME_LIBRARY}
${LIBUSB_LIBRARIES}
${Boost_THREAD_LIBRARY}
${Boost_SYSTEM_LIBRARY}