Fix compilation.

This commit is contained in:
2021-11-12 06:15:33 +00:00
parent 9c19475cf7
commit db1d1e609b
3 changed files with 7 additions and 10 deletions

View File

@@ -2,17 +2,14 @@ set(LT_CURRENT 1)
set(LT_REVISION 7)
set(LT_AGE 0)
set(PROJECT_SOURCE_DIR "${PROJECT_SOURCE_DIR}/3rdparty/bzip2/")
set(PROJECT_BINARY_DIR "${PROJECT_BINARY_DIR}/3rdparty/bzip2/")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/bzip2/cmake")
include(Version)
include(SymLink)
set(BZ_VERSION ${LT_CURRENT}.${LT_AGE}.${LT_REVISION})
configure_file (
${PROJECT_SOURCE_DIR}/bz_version.h.in
${PROJECT_BINARY_DIR}/bz_version.h
${PROJECT_SOURCE_DIR}/3rdparty/bzip2/bz_version.h.in
${PROJECT_BINARY_DIR}/3rdparty/bzip2/bz_version.h
)
include_directories(${PROJECT_BINARY_DIR})

7
3rdparty/flac.cmake vendored
View File

@@ -16,7 +16,8 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/flac/cmake")
set(VERSION ${FLAC_VERSION})
#set(PROJECT_SOURCE_DIR "${PROJECT_SOURCE_DIR}/flac/")
set(OLD_PROJECT_SOURCE_DIR "${PROJECT_SOURCE_DIR}")
set(PROJECT_SOURCE_DIR "${PROJECT_SOURCE_DIR}/3rdparty/flac/")
#find_package(Iconv)
#set(HAVE_ICONV ${Iconv_FOUND})
@@ -165,4 +166,6 @@ if(ARCHITECTURE_IS_64BIT)
set(ENABLE_64_BIT_WORDS 1)
endif()
configure_file(3rdparty/flac/config.cmake.h.in 3rdparty/flac/config.h)
configure_file(3rdparty/flac/config.cmake.h.in 3rdparty/flac/config.h)
set(PROJECT_SOURCE_DIR "${OLD_PROJECT_SOURCE_DIR}")

View File

@@ -1,6 +1,3 @@
cmake_minimum_required(VERSION 2.8.12)
project(lzfse C)
message(STATUS "LZFSE VERSION: Unknown")
include(CheckCCompilerFlag)