From 5a1114e4a09ee445af08462426b03643fd8980c0 Mon Sep 17 00:00:00 2001 From: Patrix Date: Fri, 1 Mar 2024 14:50:43 +0100 Subject: [PATCH] Updated sqapi + adjusted CMake to use ${PROJECT_NAME} instead of direct target name --- CMakeLists.txt | 10 +++++----- dependencies/CMakeLists.txt | 2 +- dependencies/sqapi | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ad70c4d..3d5a683 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.17) +cmake_minimum_required(VERSION 3.21) project(squirrel-template) @@ -11,14 +11,14 @@ file(GLOB SRC "src/sqmain.cpp" ) -add_library(squirrel-template SHARED ${SRC}) +add_library(${PROJECT_NAME} SHARED ${SRC}) -target_compile_definitions(squirrel-template +target_compile_definitions(${PROJECT_NAME} PRIVATE SCRAT_EXPORT ) -target_include_directories(squirrel-template +target_include_directories(${PROJECT_NAME} INTERFACE "include/" PRIVATE @@ -28,7 +28,7 @@ target_include_directories(squirrel-template add_subdirectory(dependencies) if(DEFINED OUT_FILE_SUFFIX) - set_target_properties(squirrel-template + set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" SUFFIX ".${OUT_FILE_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}" diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt index 94f5c9b..e341f1a 100644 --- a/dependencies/CMakeLists.txt +++ b/dependencies/CMakeLists.txt @@ -1,3 +1,3 @@ add_subdirectory(sqapi) -target_link_libraries(squirrel-template PUBLIC sqapi) \ No newline at end of file +target_link_libraries(${PROJECT_NAME} PUBLIC sqapi) \ No newline at end of file diff --git a/dependencies/sqapi b/dependencies/sqapi index af0918c..9c4c507 160000 --- a/dependencies/sqapi +++ b/dependencies/sqapi @@ -1 +1 @@ -Subproject commit af0918cc4043ec5426f3a3a60b88b830a32632f0 +Subproject commit 9c4c50740fface149d5938b0458c1deff3d2852d