30 lines
1.4 KiB
Diff
30 lines
1.4 KiB
Diff
|
diff -rup lloyd-yajl-fee1ebe.orig/src/CMakeLists.txt lloyd-yajl-fee1ebe.new/src/CMakeLists.txt
|
||
|
|
--- lloyd-yajl-fee1ebe.orig/src/CMakeLists.txt 2011-12-20 00:23:22.000000000 +0000
|
||
|
|
+++ lloyd-yajl-fee1ebe.new/src/CMakeLists.txt 2012-08-06 13:59:02.222065755 +0100
|
||
|
|
@@ -30,7 +30,7 @@ ADD_DEFINITIONS(-DYAJL_BUILD)
|
||
|
|
# set up some paths
|
||
|
|
SET (libDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib)
|
||
|
|
SET (incDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/include/yajl)
|
||
|
|
-SET (shareDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/share/pkgconfig)
|
||
|
|
+SET (pkgconfigDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib/pkgconfig)
|
||
|
|
|
||
|
|
# set the output path for libraries
|
||
|
|
SET(LIBRARY_OUTPUT_PATH ${libDir})
|
||
|
|
@@ -61,7 +61,7 @@ FILE(MAKE_DIRECTORY ${incDir})
|
||
|
|
# generate build-time source
|
||
|
|
SET(dollar $)
|
||
|
|
CONFIGURE_FILE(api/yajl_version.h.cmake ${incDir}/yajl_version.h)
|
||
|
|
-CONFIGURE_FILE(yajl.pc.cmake ${shareDir}/yajl.pc)
|
||
|
|
+CONFIGURE_FILE(yajl.pc.cmake ${pkgconfigDir}/yajl.pc)
|
||
|
|
|
||
|
|
# copy public headers to output directory
|
||
|
|
FOREACH (header ${PUB_HDRS})
|
||
|
|
@@ -82,5 +82,5 @@ IF(NOT WIN32)
|
||
|
|
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)
|
||
|
|
+ INSTALL(FILES ${pkgconfigDir}/yajl.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
|
||
|
|
ENDIF()
|
||
|
|
Only in lloyd-yajl-fee1ebe.new/src: CMakeLists.txt~
|