diff --git a/CMakeLists.txt b/CMakeLists.txt index 62575e135..3b9c28a96 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -325,7 +325,7 @@ endif() # Find icons, orm/version.hpp, and Windows manifest file for MinGW if(CMAKE_SYSTEM_NAME STREQUAL "Windows") - tiny_set_rc_flags("-I \"${CMAKE_CURRENT_SOURCE_DIR}/resources\"") + tiny_set_rc_flags("-I \"${PROJECT_SOURCE_DIR}/resources\"") endif() include(TinyResourceAndManifest) diff --git a/cmake/Modules/TinyInitDefaultVariables.cmake b/cmake/Modules/TinyInitDefaultVariables.cmake index d8141024e..2d8e5b28f 100644 --- a/cmake/Modules/TinyInitDefaultVariables.cmake +++ b/cmake/Modules/TinyInitDefaultVariables.cmake @@ -217,19 +217,19 @@ macro(tiny_init_tiny_variables) string(PREPEND TINY_TESTS_ENV "\ $:/debug>/\ ${CMAKE_INSTALL_BINDIR}>${TINY_PATH_SEPARATOR}\ -$${TINY_PATH_SEPARATOR}") +$${TINY_PATH_SEPARATOR}") # Prepend TinyOrm and TinyUtils library folders else() # Multi-config generators have different folders structure if(TINY_IS_MULTI_CONFIG) string(PREPEND TINY_TESTS_ENV "\ -$>${TINY_PATH_SEPARATOR}\ -$>${TINY_PATH_SEPARATOR}") +$>${TINY_PATH_SEPARATOR}\ +$>${TINY_PATH_SEPARATOR}") else() string(PREPEND TINY_TESTS_ENV "\ -$${TINY_PATH_SEPARATOR}\ -$${TINY_PATH_SEPARATOR}") +$${TINY_PATH_SEPARATOR}\ +$${TINY_PATH_SEPARATOR}") endif() endif() endif() diff --git a/cmake/Modules/TinySources.cmake b/cmake/Modules/TinySources.cmake index 8beb68d83..6a1c339a4 100644 --- a/cmake/Modules/TinySources.cmake +++ b/cmake/Modules/TinySources.cmake @@ -378,8 +378,8 @@ function(tinytom_sources out_headers out_sources) list(SORT headers) list(SORT sources) - list(TRANSFORM headers PREPEND "${CMAKE_SOURCE_DIR}/tom/include/tom/") - list(TRANSFORM sources PREPEND "${CMAKE_SOURCE_DIR}/tom/src/tom/") + list(TRANSFORM headers PREPEND "${PROJECT_SOURCE_DIR}/tom/include/tom/") + list(TRANSFORM sources PREPEND "${PROJECT_SOURCE_DIR}/tom/src/tom/") set(${out_headers} ${headers} PARENT_SCOPE) set(${out_sources} ${sources} PARENT_SCOPE) diff --git a/cmake/Modules/TinyTestCommon.cmake b/cmake/Modules/TinyTestCommon.cmake index 398ec75d9..aee2f7ce6 100644 --- a/cmake/Modules/TinyTestCommon.cmake +++ b/cmake/Modules/TinyTestCommon.cmake @@ -12,7 +12,7 @@ ${TINY_UNPARSED_ARGUMENTS}") endif() target_precompile_headers(${name} PRIVATE - $<$:"${CMAKE_SOURCE_DIR}/include/pch.h"> + $<$:"${${TinyOrm_ns}_SOURCE_DIR}/include/pch.h"> ) if(NOT CMAKE_DISABLE_PRECOMPILE_HEADERS) @@ -56,11 +56,15 @@ ${TINY_UNPARSED_ARGUMENTS}") endif() if(TINY_INCLUDE_MIGRATIONS) - target_include_directories(${name} PRIVATE "${CMAKE_SOURCE_DIR}/tests/database") + target_include_directories(${name} + PRIVATE "${${TinyOrm_ns}_SOURCE_DIR}/tests/database" + ) endif() if(TINY_INCLUDE_MODELS) - target_include_directories(${name} PRIVATE "${CMAKE_SOURCE_DIR}/tests/models") + target_include_directories(${name} + PRIVATE "${${TinyOrm_ns}_SOURCE_DIR}/tests/models" + ) endif() target_link_libraries(${name} @@ -75,7 +79,7 @@ ${TINY_UNPARSED_ARGUMENTS}") # Find Windows manifest file for MinGW if(MINGW) - tiny_set_rc_flags("-I \"${CMAKE_SOURCE_DIR}/tests/resources\"") + tiny_set_rc_flags("-I \"${${TinyOrm_ns}_SOURCE_DIR}/tests/resources\"") # I will not use output variables here, I like it this way 🤘 set(CMAKE_RC_FLAGS ${CMAKE_RC_FLAGS} PARENT_SCOPE) @@ -84,7 +88,7 @@ ${TINY_UNPARSED_ARGUMENTS}") tiny_resource_and_manifest(${name} OUTPUT_DIR "${TINY_BUILD_GENDIR}/tmp/" - TEST RESOURCES_DIR "${CMAKE_SOURCE_DIR}/tests/resources" + TEST RESOURCES_DIR "${${TinyOrm_ns}_SOURCE_DIR}/tests/resources" ) endfunction() diff --git a/examples/tom/CMakeLists.txt b/examples/tom/CMakeLists.txt index efceede80..c9e377b22 100644 --- a/examples/tom/CMakeLists.txt +++ b/examples/tom/CMakeLists.txt @@ -7,7 +7,7 @@ include(TinyHelpers) tiny_read_version(TINY_VERSION TINY_VERSION_MAJOR TINY_VERSION_MINOR TINY_VERSION_PATCH TINY_VERSION_TWEAK - VERSION_HEADER "${CMAKE_SOURCE_DIR}/tom/include/tom/version.hpp" + VERSION_HEADER "${${TinyOrm_ns}_SOURCE_DIR}/tom/include/tom/version.hpp" PREFIX TINYTOM HEADER_FOR "${TomExample_ns}" ) @@ -42,7 +42,7 @@ set_target_properties(${TomExample_target} ) target_include_directories(${TomExample_target} PRIVATE - "${CMAKE_SOURCE_DIR}/tests/database" + "${${TinyOrm_ns}_SOURCE_DIR}/tests/database" ) # Tom command-line application defines @@ -58,13 +58,13 @@ target_compile_definitions(${TomExample_target} # Find icons, tom/version.hpp, and Windows manifest file for MinGW if(CMAKE_SYSTEM_NAME STREQUAL "Windows") - tiny_set_rc_flags("-I \"${CMAKE_SOURCE_DIR}/tom/resources\"") + tiny_set_rc_flags("-I \"${${TinyOrm_ns}_SOURCE_DIR}/tom/resources\"") endif() include(TinyResourceAndManifest) tiny_resource_and_manifest(${TomExample_target} OUTPUT_DIR "${TINY_BUILD_GENDIR}/tmp/" - RESOURCES_DIR "${CMAKE_SOURCE_DIR}/tom/resources" + RESOURCES_DIR "${${TinyOrm_ns}_SOURCE_DIR}/tom/resources" ) # Resolve and link dependencies diff --git a/tests/TinyUtils/CMakeLists.txt b/tests/TinyUtils/CMakeLists.txt index 31494821a..5d56f7358 100644 --- a/tests/TinyUtils/CMakeLists.txt +++ b/tests/TinyUtils/CMakeLists.txt @@ -86,7 +86,7 @@ endif() # Find Windows manifest file if(MINGW) - tiny_set_rc_flags("-I \"${CMAKE_CURRENT_SOURCE_DIR}/resources\"") + tiny_set_rc_flags("-I \"${PROJECT_SOURCE_DIR}/resources\"") # To remove values from CMAKE_RC_FLAGS from the previous call elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows") @@ -111,7 +111,7 @@ target_link_libraries(${TinyUtils_target} # --- # Create an empty SQLite database file when does not exist -set(tiny_sqlite_db "${CMAKE_BINARY_DIR}/tests/q_tinyorm_test_1.sqlite3") +set(tiny_sqlite_db "${${TinyOrm_ns}_BINARY_DIR}/tests/q_tinyorm_test_1.sqlite3") create_sqlite_db("${tiny_sqlite_db}") target_compile_definitions(${TinyUtils_target} diff --git a/tests/auto/functional/others/version/CMakeLists.txt b/tests/auto/functional/others/version/CMakeLists.txt index 3120e9db0..a56dd356c 100644 --- a/tests/auto/functional/others/version/CMakeLists.txt +++ b/tests/auto/functional/others/version/CMakeLists.txt @@ -25,7 +25,7 @@ if(TOM_EXAMPLE) target_compile_definitions(version PRIVATE TINYTOM_EXAMPLE) # To find tom/include/version.hpp - target_include_directories(version PRIVATE "${CMAKE_SOURCE_DIR}/tom/include") + target_include_directories(version PRIVATE "${${TinyOrm_ns}_SOURCE_DIR}/tom/include") endif() target_include_directories(version PRIVATE diff --git a/tests/testdata_tom/CMakeLists.txt b/tests/testdata_tom/CMakeLists.txt index 38d5f15fa..66c23f21a 100644 --- a/tests/testdata_tom/CMakeLists.txt +++ b/tests/testdata_tom/CMakeLists.txt @@ -7,7 +7,7 @@ include(TinyHelpers) tiny_read_version(TINY_VERSION TINY_VERSION_MAJOR TINY_VERSION_MINOR TINY_VERSION_PATCH TINY_VERSION_TWEAK - VERSION_HEADER "${CMAKE_SOURCE_DIR}/tom/include/tom/version.hpp" + VERSION_HEADER "${${TinyOrm_ns}_SOURCE_DIR}/tom/include/tom/version.hpp" PREFIX TINYTOM HEADER_FOR "${TomTestData_ns}" ) @@ -58,13 +58,13 @@ target_compile_definitions(${TomTestData_target} # Find icons, tom/version.hpp, and Windows manifest file for MinGW if(CMAKE_SYSTEM_NAME STREQUAL "Windows") - tiny_set_rc_flags("-I \"${CMAKE_SOURCE_DIR}/tom/resources\"") + tiny_set_rc_flags("-I \"${${TinyOrm_ns}_SOURCE_DIR}/tom/resources\"") endif() include(TinyResourceAndManifest) tiny_resource_and_manifest(${TomTestData_target} OUTPUT_DIR "${TINY_BUILD_GENDIR}/tmp/" - RESOURCES_DIR "${CMAKE_SOURCE_DIR}/tom/resources" + RESOURCES_DIR "${${TinyOrm_ns}_SOURCE_DIR}/tom/resources" RESOURCE_BASENAME ${Tom_target} MANIFEST_BASENAME ${Tom_target} )