Skip to content
Browse files

some bzip2 stuff

  • Loading branch information...
1 parent b66580e commit 4eca4824e63ed720b53c737fc84bbbf6befae1d3 @karolherbst karolherbst committed Mar 16, 2012
Showing with 7 additions and 2 deletions.
  1. +4 −0 src/CMakeLists.txt
  2. +2 −0 src/static/util/CMakeLists.txt
  3. +1 −2 third_party/bzip2/CMakeLists.txt
View
4 src/CMakeLists.txt
@@ -88,6 +88,10 @@ if(NOT BREAKPAD_EXCEPTION_HANDLER_FOUND)
add_dependencies(mdump breakpad)
endif()
+if(NOT BZIP2_FOUND)
+ add_dependencies(util bzip2)
+endif()
+
if(NOT CURL_FOUND)
add_dependencies(util curl)
add_dependencies(uicore curl)
View
2 src/static/util/CMakeLists.txt
@@ -1,5 +1,7 @@
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
+ ${Boost_INCLUDE_DIR}
+ ${BZIP2_INCLUDE_DIR}
${CURL_INCLUDE_DIRS}
${SQLITE3X_INCLUDE_DIRS}
)
View
3 third_party/bzip2/CMakeLists.txt
@@ -5,9 +5,8 @@ include_directories(
set(BZIP2_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/ PARENT_SCOPE)
file(GLOB Headers ./include/*.h)
-file(GLOB Sources ./code/*.c ./include/*.h)
+file(GLOB Sources ./code/*.c)
-add_definitions(-fPIC)
add_library(bzip2 STATIC ${Sources})
target_link_libraries(bzip2
)

0 comments on commit 4eca482

Please sign in to comment.
Something went wrong with that request. Please try again.