generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-03-06 04:55:42 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'poco-1.10.1' into devel

Browse Source
This commit is contained in:
Günter Obiltschnig 2020-02-07 06:45:50 +01:00
commit a5b1d9a07b
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -443,7 +443,7 @@ write_basic_package_version_file(
if (WIN32)
set(PocoConfigPackageLocation "cmake")
else()
set(PocoConfigPackageLocation "lib/cmake/${PROJECT_NAME}")
set(PocoConfigPackageLocation "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}")
endif()
configure_file(cmake/${PROJECT_NAME}Config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" @ONLY)

3
CppUnit/CMakeLists.txt
View File

@ -33,6 +33,3 @@ elseif(MINGW)
PUBLIC
_DLL)
endif()
POCO_INSTALL(CppUnit)

5
Data/SQLite/CMakeLists.txt
View File

@ -44,7 +44,10 @@ target_include_directories(DataSQLite
if(POCO_UNBUNDLED)
target_link_libraries(DataSQLite PUBLIC SQLite::SQLite3)
target_compile_definitions(DataSQLite PUBLIC POCO_UNBUNDLED)
target_compile_definitions(DataSQLite PUBLIC
POCO_UNBUNDLED
SQLITE_THREADSAFE=1
)
else()
if(WINCE)
target_compile_definitions(DataSQLite PRIVATE SQLITE_MSVC_LOCALTIME_API)

2
cmake/PocoMacros.cmake
View File

@ -239,7 +239,7 @@ configure_file("cmake/Poco${target_name}Config.cmake"
if (WIN32)
set(PocoConfigPackageLocation "cmake")
else()
set(PocoConfigPackageLocation "lib/cmake/${PROJECT_NAME}")
set(PocoConfigPackageLocation "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}")
endif()
install(