From: Harley Laue Date: Thu, 13 May 2010 01:15:36 +0000 (-0500) Subject: Oops, BZip2 isn't really a dependency! X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=cf2faac0815fb62ba50251d4ff72e2de8bd4afe8;hp=2a527b7862fd1741a35536ab5427ade2fff089c0;p=lugaru.git Oops, BZip2 isn't really a dependency! --- diff --git a/CMakeLists.txt b/CMakeLists.txt index abcb734..9be2c9e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,6 @@ endif(WIN32) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") find_package(OpenAL REQUIRED) -find_package(BZip2 REQUIRED) find_package(PNG REQUIRED) find_package(JPEG REQUIRED) find_package(ZLIB REQUIRED) @@ -41,7 +40,6 @@ find_package(OggVorbis REQUIRED) include_directories( ${OPENAL_INCLUDES} - ${BZIP2_INCLUDE_DIR} ${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} @@ -52,7 +50,7 @@ include_directories( ${OGG_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/Source) -set(LUGARU_LIBS ${OPENAL_LIBRARY} ${PNG_LIBRARY} ${JPEG_LIBRARY} ${BZIP2_LIBRARIES} ${ZLIB_LIBRARIES} ${SDL_LIBRARY} ${GLU_LIBRARY} ${OPENGL_LIBRARY} ${VORBISFILE_LIBRARY} ${OGG_LIBRARY}) +set(LUGARU_LIBS ${OPENAL_LIBRARY} ${PNG_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARIES} ${SDL_LIBRARY} ${GLU_LIBRARY} ${OPENGL_LIBRARY} ${VORBISFILE_LIBRARY} ${OGG_LIBRARY}) add_subdirectory(Source)