Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

disable ps-lite on windows for now #358

Merged
merged 1 commit into from
Oct 22, 2015
Merged

disable ps-lite on windows for now #358

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ else(MSVC)
endif(MSVC)

if(USE_OPENCV)
if(MSVC)
set(OpenCV_STATIC OFF)
endif()
find_package(OpenCV QUIET COMPONENTS core highgui imgproc imgcodecs)
if(NOT OpenCV_FOUND) # if not OpenCV 3.x, then imgcodecs are not found
find_package(OpenCV REQUIRED COMPONENTS core highgui imgproc)
Expand Down Expand Up @@ -68,7 +65,9 @@ if(USE_CUDNN)
endif()

add_subdirectory("dmlc-core")
add_subdirectory("ps-lite")
if(NOT MSVC)
add_subdirectory("ps-lite")
endif()

mxnet_source_group("Source" GLOB_RECURSE "src/*.cc")
mxnet_source_group("Source\\Cuda" GLOB_RECURSE "src/*.cu")
Expand All @@ -93,8 +92,10 @@ endif()
add_library(mxnet SHARED ${SOURCE})
target_link_libraries(mxnet ${mshadow_LINKER_LIBS})
target_link_libraries(mxnet dmlccore)
target_link_libraries(mxnet pslite)
target_link_libraries(mxnet ${pslite_LINKER_LIBS})
if(NOT MSVC)
target_link_libraries(mxnet pslite)
target_link_libraries(mxnet ${pslite_LINKER_LIBS})
endif()
set_target_properties(mxnet PROPERTIES OUTPUT_NAME "libmxnet")

# ---[ Linter target
Expand Down