diff options
| author | Austin Ziegler <austin@zieglers.ca> | 2012-04-24 16:06:24 -0400 |
|---|---|---|
| committer | Lloyd Hilaiel <lloyd@hilaiel.com> | 2014-02-15 10:40:14 +0100 |
| commit | 02d677c4fb8ff546170ee661084e2676eadee578 (patch) | |
| tree | dce6f74a3e65fa950f4847d61a447b8a1095b421 | |
| parent | 7a021ff622e8eaf549674eed5d5a805abd59ee1b (diff) | |
| download | yajl-02d677c4fb8ff546170ee661084e2676eadee578.tar.gz | |
Makes 'nmake install' work.
In BUILDING.WIN32, the following line exists:
nmake install
This doesn't work because the install targets never get built because of
the code:
IF(NOT WIN32)
INSTALL(...)
...
ENDIF()
in several CMakeLists.txt files. There's no reason to disallow INSTALL
on Windows, even if most developers (who use devenv on its own) will
never use it.
| -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) |