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

Makes 'nmake install' work. #78

Closed
wants to merge 1 commit into from
Closed

Makes 'nmake install' work. #78

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: 1 addition & 3 deletions reformatter/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -34,6 +34,4 @@ GET_TARGET_PROPERTY(binPath json_reformat LOCATION)
ADD_CUSTOM_COMMAND(TARGET json_reformat POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir})

IF (NOT WIN32)
INSTALL(TARGETS json_reformat RUNTIME DESTINATION bin)
ENDIF ()
INSTALL(TARGETS json_reformat RUNTIME DESTINATION bin)
19 changes: 10 additions & 9 deletions src/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -75,12 +75,13 @@ ENDFOREACH (header ${PUB_HDRS})

INCLUDE_DIRECTORIES(${incDir}/..)

IF(NOT WIN32)
# at build time you may specify the cmake variable LIB_SUFFIX to handle
# 64-bit systems which use 'lib64'
INSTALL(TARGETS yajl LIBRARY DESTINATION lib${LIB_SUFFIX})
INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX})
INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl)
INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl)
INSTALL(FILES ${shareDir}/yajl.pc DESTINATION share/pkgconfig)
ENDIF()
# at build time you may specify the cmake variable LIB_SUFFIX to handle
# 64-bit systems which use 'lib64'
INSTALL(TARGETS yajl
RUNTIME DESTINATION lib${LIB_SUFFIX}
LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION lib${LIB_SUFFIX})
INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX})
INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl)
INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl)
INSTALL(FILES ${shareDir}/yajl.pc DESTINATION share/pkgconfig)
4 changes: 1 addition & 3 deletions verify/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -34,6 +34,4 @@ GET_TARGET_PROPERTY(binPath json_verify LOCATION)
ADD_CUSTOM_COMMAND(TARGET json_verify POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir})

IF (NOT WIN32)
INSTALL(TARGETS json_verify RUNTIME DESTINATION bin)
ENDIF ()
INSTALL(TARGETS json_verify RUNTIME DESTINATION bin)