diff options
| -rw-r--r-- | reformatter/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | verify/CMakeLists.txt | 4 |
3 files changed, 12 insertions, 15 deletions
diff --git a/reformatter/CMakeLists.txt b/reformatter/CMakeLists.txt index 57d2134..42de0b8 100644 --- a/reformatter/CMakeLists.txt +++ b/reformatter/CMakeLists.txt @@ -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) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6ebf648..99cf9e9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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) diff --git a/verify/CMakeLists.txt b/verify/CMakeLists.txt index 9d78cee..967fca1 100644 --- a/verify/CMakeLists.txt +++ b/verify/CMakeLists.txt @@ -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) |