fix some errors

This commit is contained in:
Daniel Larimer 2013-08-13 13:31:10 -04:00
parent d8a047692c
commit d7eb7efb65

View file

@ -16,17 +16,17 @@ FILE(GLOB HDRS *.h pavlov/*.h easylzma/*.h)
FILE(GLOB PUB_HDRS easylzma/*.h) FILE(GLOB PUB_HDRS easylzma/*.h)
# set up some paths for outputing the usable binaries # set up some paths for outputing the usable binaries
SET (libDir #SET (libDir
${CMAKE_CURRENT_BINARY_DIR}/../${EASYLZMA_DIST_NAME}/lib) # ${CMAKE_CURRENT_BINARY_DIR}/${EASYLZMA_DIST_NAME}/lib)
SET (incDir #SET (incDir
${CMAKE_CURRENT_BINARY_DIR}/../${EASYLZMA_DIST_NAME}/include/easylzma) # ${CMAKE_CURRENT_BINARY_DIR}/${EASYLZMA_DIST_NAME}/include/easylzma)
# an include directory to allow easylzma implementation to find public # an include directory to allow easylzma implementation to find public
# headers # headers
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
# get the built libs into the correct place # get the built libs into the correct place
SET(LIBRARY_OUTPUT_PATH ${libDir}) #SET(LIBRARY_OUTPUT_PATH ${libDir})
ADD_LIBRARY(easylzma_static STATIC ${SRCS} ${HDRS}) ADD_LIBRARY(easylzma_static STATIC ${SRCS} ${HDRS})
#ADD_LIBRARY(easylzma SHARED ${SRCS} ${HDRS}) #ADD_LIBRARY(easylzma SHARED ${SRCS} ${HDRS})
@ -47,8 +47,8 @@ ENDIF (APPLE)
# COMPILE_FLAGS ${sharedLibCompileFlags}) # COMPILE_FLAGS ${sharedLibCompileFlags})
# create these output directories # create these output directories
FILE(MAKE_DIRECTORY ${libDir}) #FILE(MAKE_DIRECTORY ${libDir})
FILE(MAKE_DIRECTORY ${incDir}) #FILE(MAKE_DIRECTORY ${incDir})
### copy the two required headers into our output dir as a post build step ### copy the two required headers into our output dir as a post build step
# copy public headers to output directory # copy public headers to output directory