Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tsoc
openmm
Commits
663ae998
Commit
663ae998
authored
Oct 27, 2014
by
peastman
Browse files
Merge pull request #675 from peastman/master
Added 64 bit version of Windows pthreads library
parents
fd12265c
a6f749d1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
CMakeLists.txt
CMakeLists.txt
+6
-2
libraries/pthreads/lib/pthreadVC2_x64.dll
libraries/pthreads/lib/pthreadVC2_x64.dll
+0
-0
libraries/pthreads/lib/pthreadVC2_x64.lib
libraries/pthreads/lib/pthreadVC2_x64.lib
+0
-0
No files found.
CMakeLists.txt
View file @
663ae998
...
...
@@ -89,8 +89,12 @@ IF(WIN32)
INSTALL
(
FILES
${
lib
}
DESTINATION
"lib/"
)
ENDFOREACH
(
lib
)
LINK_DIRECTORIES
(
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
CMAKE_CFG_INTDIR
}
"
)
SET
(
PTHREADS_LIB pthreadVC2
)
SET
(
PTHREADS_LIB_STATIC pthreadVC2_static_mt
)
IF
(
CMAKE_SIZEOF_VOID_P EQUAL 8
)
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
)
IF
(
NOT ANDROID
)
SET
(
PTHREADS_LIB pthread
)
...
...
libraries/pthreads/lib/pthreadVC2_x64.dll
0 → 100644
View file @
663ae998
File added
libraries/pthreads/lib/pthreadVC2_x64.lib
0 → 100644
View file @
663ae998
File added
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment