Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added rules for installing binaries. Removed rules installing nlopt files #23

Merged
merged 1 commit into from Jan 27, 2017
Merged

Added rules for installing binaries. Removed rules installing nlopt files #23

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions program/main/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -7,3 +7,7 @@ ADD_EXECUTABLE(genOption genOption.cc)

ADD_EXECUTABLE(cmvs cmvs.cc)
TARGET_LINK_LIBRARIES(cmvs cmvs_lib image_lib graclus_lib ${PMVS_LIBRARIES} tinycthread)

INSTALL(TARGETS genOption DESTINATION bin/)
INSTALL(TARGETS cmvs DESTINATION bin/)
INSTALL(TARGETS pmvs2 DESTINATION bin/)
12 changes: 6 additions & 6 deletions program/thirdParty/nlopt-2.4.2/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -155,7 +155,7 @@ IF(BUILD_SHARED_LIBS)
ADD_DEFINITIONS(-DNLOPT_DLL_EXPORT )
ENDIF(BUILD_SHARED_LIBS)

INSTALL ( FILES ${NLOPT_HEADERS} DESTINATION include )
#INSTALL ( FILES ${NLOPT_HEADERS} DESTINATION include )

ADD_LIBRARY (nlopt STATIC ${NLOPT_SOURCES} )

Expand All @@ -174,11 +174,11 @@ IF (_VERSION_INFO_LINE)
ENDIF ()
ENDIF ()

INSTALL ( TARGETS nlopt
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION lib${LIB_SUFFIX}
)
#INSTALL ( TARGETS nlopt
# RUNTIME DESTINATION bin
# LIBRARY DESTINATION lib${LIB_SUFFIX}
# ARCHIVE DESTINATION lib${LIB_SUFFIX}
# )