Skip to content

Commit 4baf3ca

Browse files
committed
cmake update
1 parent edeeae0 commit 4baf3ca

1 file changed

Lines changed: 10 additions & 3 deletions

File tree

CMakeLists.txt

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,25 @@ set(CMAKE_CXX_STANDARD 17)
6565
if(!TM_VERSION)
6666
execute_process(
6767
COMMAND git describe --tags --abbrev=0
68-
OUTPUT_VARIABLE tm_version)
68+
OUTPUT_VARIABLE tm_version
69+
OUTPUT_STRIP_TRAILING_WHITESPACE)
6970
add_compile_definitions(TM_VERSION=${tm_version})
7071
endif()
7172

7273
if(MSVC)
7374
find_package(unofficial-sqlite3 CONFIG REQUIRED)
7475
add_library(SQLite::SQLite3 ALIAS unofficial::sqlite3::sqlite3)
7576
add_definitions(-D_USE_MATH_DEFINES -DWIN32_LEAN_AND_MEAN -DNOGDI -D__restrict__=__restrict)
76-
set(THREAD_LIB "")
77+
set(THREAD_LIB "")
7778
else()
7879
find_package(SQLite3 REQUIRED)
79-
set(THREAD_LIB pthread)
80+
if(NOT TARGET SQLite::SQLite3)
81+
add_library(SQLite::SQLite3 IMPORTED UNKNOWN)
82+
set_target_properties(SQLite::SQLite3 PROPERTIES
83+
IMPORTED_LOCATION "${SQLite3_LIBRARIES}"
84+
INTERFACE_INCLUDE_DIRECTORIES "${SQLite3_INCLUDE_DIRS}")
85+
endif()
86+
set(THREAD_LIB pthread)
8087
endif()
8188

8289
file(GLOB tilemaker_src_files

0 commit comments

Comments
 (0)