Skip to content

GitLab

"...src/ssh:/git@developer.sourcefind.cn:2222/tsoc/openmm.git" did not exist on "7d7490ea425a3fdd44ccee77aa228056a5b63aa6"
Commit 663ae998 authored by peastman's avatar peastman
Browse files

Merge pull request #675 from peastman/master 

Added 64 bit version of Windows pthreads library
parents fd12265c a6f749d1
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
CMakeLists.txt
View file @ 663ae998
...@@ -89,8 +89,12 @@ IF(WIN32) ...@@ -89,8 +89,12 @@ IF(WIN32)
INSTALL(FILES ${lib} DESTINATION "lib/") INSTALL(FILES ${lib} DESTINATION "lib/")
ENDFOREACH(lib) ENDFOREACH(lib)
LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}") LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}")
SET(PTHREADS_LIB pthreadVC2) IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(PTHREADS_LIB_STATIC pthreadVC2_static_mt) SET(PTHREADS_LIB pthreadVC2_x64)
ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(PTHREADS_LIB pthreadVC2)
SET(PTHREADS_LIB_STATIC pthreadVC2_static_mt)
ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
ELSE(WIN32) ELSE(WIN32)
IF (NOT ANDROID) IF (NOT ANDROID)
SET(PTHREADS_LIB pthread) SET(PTHREADS_LIB pthread)
......
Markdown is supported
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