From: alex85k Date: Sun, 10 Sep 2017 17:33:38 +0000 (+0500) Subject: fixed: Newer CMake was creating temporary .lib file overwriting sqlite3.lib X-Git-Tag: sqlite-v1.0.23~6 X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=9564ab3bda829ac7d29613f7ae703f3bd77f76b8;p=sqlite3-cmake.git fixed: Newer CMake was creating temporary .lib file overwriting sqlite3.lib --- diff --git a/CMakeLists.txt b/CMakeLists.txt index d060a14..cfb09ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 2.8) include_directories(${CMAKE_SOURCE_DIR}/src) add_library(sqlite3 STATIC src/sqlite3.c src/sqlite3.h src/sqlite3ext.h) add_executable(sqlite src/sqlite3.c src/shell.c src/sqlite3.h src/sqlite3ext.h) -set_target_properties(sqlite PROPERTIES OUTPUT_NAME sqlite3) +#set_target_properties(sqlite PROPERTIES OUTPUT_NAME sqlite3) add_definitions(-DSQLITE_ENABLE_RTREE) add_definitions(-DSQLITE_ENABLE_FTS4) @@ -18,11 +18,17 @@ add_definitions(-DSQLITE_ENABLE_STAT4) # Uncomment this for single-threaded variant (faster) #add_definitions(-DSQLITE_THREADSAFE=0) -if(NOT WIN32) +if(WIN32) + add_custom_command(TARGET sqlite POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_BINARY_DIR}/sqlite3.exe + DEPENDS sqlite + ) + install(FILES sqlite3.exe DESTINATION bin) +else() include(FindThreads) target_link_libraries(sqlite m ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS}) + install(TARGETS sqlite RUNTIME DESTINATION bin) endif() install(FILES src/sqlite3.h src/sqlite3ext.h DESTINATION include) install(TARGETS sqlite3 LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) -install(TARGETS sqlite RUNTIME DESTINATION bin)