diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2017-09-16 17:45:55 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2017-09-16 17:45:55 +0000 |
| commit | 5286b7110440115fb808f4769d879df48141de9e (patch) | |
| tree | 52375eb91351520131d052056926f89399fe8ebb /emulators | |
| parent | Update to version 1.1.0 (diff) | |
emulators/ppsspp-qt5: move CMake 3.9 fix into a separate file
Notes
Notes:
svn path=/head/; revision=449973
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/ppsspp/files/patch-CMakeLists.txt | 23 | ||||
| -rw-r--r-- | emulators/ppsspp/files/patch-system-libpng16 | 18 |
2 files changed, 23 insertions, 18 deletions
diff --git a/emulators/ppsspp/files/patch-CMakeLists.txt b/emulators/ppsspp/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..96cfd6f45396 --- /dev/null +++ b/emulators/ppsspp/files/patch-CMakeLists.txt @@ -0,0 +1,23 @@ +===> Building for ppsspp-qt5-1.4.2 +ninja: error: dependency cycle: cmake_object_order_depends_target_Core -> Core_autogen -> CMakeFiles/Core_autogen -> /wrkdirs/usr/ports/emulators/ppsspp-qt5/work/ppsspp-1.4.2/git-version.cpp -> cmake_object_order_depends_target_Core + +https://github.com/hrydgard/ppsspp/issues/9972 + +--- CMakeLists.txt.orig 2017-05-27 09:58:05 UTC ++++ CMakeLists.txt +@@ -1618,12 +1618,11 @@ endif() + + setup_target_project(${CoreLibName} Core) + +-# Generate git-version.cpp at build time. +-add_custom_target(GitVersion ALL +- DEPENDS something_that_never_exists) +-add_custom_command(OUTPUT something_that_never_exists ++add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/git-version.cpp + COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} + -P ${CMAKE_CURRENT_SOURCE_DIR}/git-version.cmake) ++# Generate git-version.cpp at build time. ++add_custom_target(GitVersion DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/git-version.cpp) + + set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/git-version.cpp + PROPERTIES GENERATED TRUE) diff --git a/emulators/ppsspp/files/patch-system-libpng16 b/emulators/ppsspp/files/patch-system-libpng16 index 8f80147b01e3..bc60517de452 100644 --- a/emulators/ppsspp/files/patch-system-libpng16 +++ b/emulators/ppsspp/files/patch-system-libpng16 @@ -1,7 +1,5 @@ Make build glue accept libpng 1.6.x and don't hardcode suffix -One hunk in src/CMakeLists.txt was added to fix target generation with ninja. - --- CMakeLists.txt.orig 2017-05-27 09:58:05 UTC +++ CMakeLists.txt @@ -582,9 +582,10 @@ else() @@ -18,22 +16,6 @@ One hunk in src/CMakeLists.txt was added to fix target generation with ninja. find_package(PackageHandleStandardArgs) find_package_handle_standard_args(PNG REQUIRED_VARS PNG_LIBRARY PNG_PNG_INCLUDE_DIR) if (PNG_FOUND) -@@ -1618,12 +1619,11 @@ endif() - - setup_target_project(${CoreLibName} Core) - --# Generate git-version.cpp at build time. --add_custom_target(GitVersion ALL -- DEPENDS something_that_never_exists) --add_custom_command(OUTPUT something_that_never_exists -+add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/git-version.cpp - COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} - -P ${CMAKE_CURRENT_SOURCE_DIR}/git-version.cmake) -+# Generate git-version.cpp at build time. -+add_custom_target(GitVersion DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/git-version.cpp) - - set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/git-version.cpp - PROPERTIES GENERATED TRUE) --- Core/Screenshot.cpp.orig 2017-05-27 09:58:05 UTC +++ Core/Screenshot.cpp @@ -21,7 +21,7 @@ |