Skip to content
This repository has been archived by the owner on Apr 7, 2022. It is now read-only.

Linked to static Pthread_win. Solves #355 #358

Closed
wants to merge 2 commits into from
Closed

Linked to static Pthread_win. Solves #355 #358

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85c6387
Linked to static Pthread_win
ldoyle May 25, 2020
b91ac82
Removed __POSIX_NT__ in windows build to match cppTango
ldoyle May 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ add_definitions(-DNPY_NO_DEPRECATED_API)
add_definitions(-DBOOST_PYTHON_STATIC_LIB)
add_definitions(-DBOOST_ALL_NO_LIB)
add_definitions(-DZMQ_STATIC)
add_definitions(-D__POSIX_NT__)
# add_definitions(-D__POSIX_NT__) #not present in cppTango build, try to make args identical

if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(PY_TARGET "64")
Expand Down Expand Up @@ -198,7 +198,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC $ENV{TANGO_ROOT}/lib/libtango.lib
$ENV{TANGO_ROOT}/lib/omnithread.lib
$ENV{TANGO_ROOT}/lib/msvcstub.lib)
target_link_libraries(${PROJECT_NAME} PUBLIC ws2_32 mswsock advapi32 comctl32 odbc32)
target_link_libraries(${PROJECT_NAME} PUBLIC $ENV{TANGO_ROOT}/lib/pthreadVC2.lib)
target_link_libraries(${PROJECT_NAME} PUBLIC $ENV{TANGO_ROOT}/lib/pthreadVC2-s.lib)
target_link_libraries(${PROJECT_NAME} PUBLIC $ENV{TANGO_ROOT}/lib/libzmq-v${VCSTR}-mt-s-${ZMQ_VERSION_}.lib)
target_link_libraries(${PROJECT_NAME} PUBLIC $ENV{BOOST_ROOT}/lib/libboost_python$ENV{PYTHON_VER}-vc${VCSTR}-mt-s-x${PY_TARGET}-${BOOST_VERSION_}.lib)
target_link_libraries(${PROJECT_NAME} PUBLIC $ENV{PYTHON_ROOT}/libs/python$ENV{PYTHON_VER}.lib)