diff options
| author | 2018-10-20 17:08:26 -0400 | |
|---|---|---|
| committer | 2018-10-20 17:36:31 -0400 | |
| commit | c8beb665dcb9e681acdb0517b8fc50d02695cb39 (patch) | |
| tree | 438465be4d1202d61508eb24a7f9cfd5fe65d016 /src | |
| parent | Merge pull request #1535 from ReinUsesLisp/fixup-position (diff) | |
| download | yuzu-c8beb665dcb9e681acdb0517b8fc50d02695cb39.tar.gz yuzu-c8beb665dcb9e681acdb0517b8fc50d02695cb39.tar.xz yuzu-c8beb665dcb9e681acdb0517b8fc50d02695cb39.zip | |
CMakeLists: Use PROJECT_SOURCE_DIR instead of CMAKE_SOURCE_DIR
This is more localized to what we want to enforce directory-wise with
the project. CMAKE_SOURCE_DIR indicates the root of the source tree, but
this would cause the wrong behavior if someone included yuzu as part of
a larger buildsystem (for whatever reason). Instead, we want to use the
directory where the "project(yuzu)" command was declared as the root
path reference.
Diffstat (limited to '')
| -rw-r--r-- | src/web_service/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/yuzu/CMakeLists.txt | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/web_service/CMakeLists.txt b/src/web_service/CMakeLists.txt index 1c83e9c34..93878f8ab 100644 --- a/src/web_service/CMakeLists.txt +++ b/src/web_service/CMakeLists.txt | |||
| @@ -10,7 +10,7 @@ add_library(web_service STATIC | |||
| 10 | create_target_directory_groups(web_service) | 10 | create_target_directory_groups(web_service) |
| 11 | 11 | ||
| 12 | get_directory_property(OPENSSL_LIBS | 12 | get_directory_property(OPENSSL_LIBS |
| 13 | DIRECTORY ${CMAKE_SOURCE_DIR}/externals/libressl | 13 | DIRECTORY ${PROJECT_SOURCE_DIR}/externals/libressl |
| 14 | DEFINITION OPENSSL_LIBS) | 14 | DEFINITION OPENSSL_LIBS) |
| 15 | target_compile_definitions(web_service PUBLIC -DCPPHTTPLIB_OPENSSL_SUPPORT) | 15 | target_compile_definitions(web_service PUBLIC -DCPPHTTPLIB_OPENSSL_SUPPORT) |
| 16 | target_link_libraries(web_service PRIVATE common json-headers ${OPENSSL_LIBS} httplib lurlparser) | 16 | target_link_libraries(web_service PRIVATE common json-headers ${OPENSSL_LIBS} httplib lurlparser) |
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index 04464ad5e..0d24e8eb0 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt | |||
| @@ -82,10 +82,10 @@ set(UIS | |||
| 82 | ) | 82 | ) |
| 83 | 83 | ||
| 84 | file(GLOB COMPAT_LIST | 84 | file(GLOB COMPAT_LIST |
| 85 | ${CMAKE_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc | 85 | ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc |
| 86 | ${CMAKE_BINARY_DIR}/dist/compatibility_list/compatibility_list.json) | 86 | ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json) |
| 87 | file(GLOB_RECURSE ICONS ${CMAKE_SOURCE_DIR}/dist/icons/*) | 87 | file(GLOB_RECURSE ICONS ${PROJECT_SOURCE_DIR}/dist/icons/*) |
| 88 | file(GLOB_RECURSE THEMES ${CMAKE_SOURCE_DIR}/dist/qt_themes/*) | 88 | file(GLOB_RECURSE THEMES ${PROJECT_SOURCE_DIR}/dist/qt_themes/*) |
| 89 | 89 | ||
| 90 | qt5_wrap_ui(UI_HDRS ${UIS}) | 90 | qt5_wrap_ui(UI_HDRS ${UIS}) |
| 91 | 91 | ||