diff options
| author | Lloyd Hilaiel <lloyd@hilaiel.com> | 2009-01-06 09:09:34 -0700 |
|---|---|---|
| committer | Lloyd Hilaiel <lloyd@hilaiel.com> | 2009-01-06 09:09:34 -0700 |
| commit | 7240b28d6eae179d02c40ff1a1a17588b4836a72 (patch) | |
| tree | c5b32e0ce8c30ff501261a643621b36aeb439435 | |
| parent | aab85151d6555e95c182fbe74e43c134ca6e960a (diff) | |
| parent | 53bca8ab52992dc20a0a028d82be5c43a2fab618 (diff) | |
| download | yajl-7240b28d6eae179d02c40ff1a1a17588b4836a72.tar.gz | |
Merge branch 'master' of git@github.com:lloyd/yajl
| -rw-r--r-- | reformatter/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | verify/CMakeLists.txt | 4 |
3 files changed, 12 insertions, 6 deletions
diff --git a/reformatter/CMakeLists.txt b/reformatter/CMakeLists.txt index 070370c..5ac7035 100644 --- a/reformatter/CMakeLists.txt +++ b/reformatter/CMakeLists.txt @@ -50,4 +50,6 @@ GET_TARGET_PROPERTY(binPath json_reformat LOCATION) ADD_CUSTOM_COMMAND(TARGET json_reformat POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir}) -INSTALL(TARGETS json_reformat RUNTIME DESTINATION bin) +IF (NOT WIN32) + INSTALL(TARGETS json_reformat RUNTIME DESTINATION bin) +ENDIF () diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dd002a7..db24757 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -69,7 +69,9 @@ ENDFOREACH (header ${PUB_HDRS}) INCLUDE_DIRECTORIES(${incDir}/..) -INSTALL(TARGETS yajl LIBRARY DESTINATION lib) -INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib) -INSTALL(DIRECTORY api/ DESTINATION include/yajl - FILES_MATCHING PATTERN "*.h") +IF(NOT WIN32) + INSTALL(TARGETS yajl LIBRARY DESTINATION lib) + INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib) + INSTALL(DIRECTORY api/ DESTINATION include/yajl + FILES_MATCHING PATTERN "*.h") +ENDIF() diff --git a/verify/CMakeLists.txt b/verify/CMakeLists.txt index 4013663..17efd83 100644 --- a/verify/CMakeLists.txt +++ b/verify/CMakeLists.txt @@ -50,4 +50,6 @@ GET_TARGET_PROPERTY(binPath json_verify LOCATION) ADD_CUSTOM_COMMAND(TARGET json_verify POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${binPath} ${binDir}) -INSTALL(TARGETS json_verify RUNTIME DESTINATION bin) +IF (NOT WIN32) + INSTALL(TARGETS json_verify RUNTIME DESTINATION bin) +ENDIF () |