diff options
| author | Anonymous Maarten <anonymous.maarten@gmail.com> | 2021-01-03 20:38:53 +0100 |
|---|---|---|
| committer | shfil <filip.gawin@zoho.com> | 2021-01-11 11:24:25 +0100 |
| commit | 6b8374f391dc4c56682cae44d142bc81d52de062 (patch) | |
| tree | 94f83d4e7d830924e889bcef26e04562c6a4d85e | |
| parent | cmake: add resource (settings windows icon) (diff) | |
| download | re3-6b8374f391dc4c56682cae44d142bc81d52de062.tar re3-6b8374f391dc4c56682cae44d142bc81d52de062.tar.gz re3-6b8374f391dc4c56682cae44d142bc81d52de062.tar.bz2 re3-6b8374f391dc4c56682cae44d142bc81d52de062.tar.lz re3-6b8374f391dc4c56682cae44d142bc81d52de062.tar.xz re3-6b8374f391dc4c56682cae44d142bc81d52de062.tar.zst re3-6b8374f391dc4c56682cae44d142bc81d52de062.zip | |
| -rw-r--r-- | CMakeLists.txt | 19 | ||||
| -rw-r--r-- | cmake/re3-config.cmake.in | 5 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 14 |
3 files changed, 7 insertions, 31 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8343f20c..665b85e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,11 +21,6 @@ if(NOT RE3_AUDIO IN_LIST RE3_AUDIOS) message(FATAL_ERROR "Illegal RE3_AUDIO=${RE3_AUDIO}") endif() -if(RE3_INSTALL) - include(GNUInstallDirs) - set(RE3_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/re3") -endif() - option(RE3_VENDORED_LIBRW "Use vendored librw" ON) if(RE3_VENDORED_LIBRW) add_subdirectory(vendor/librw) @@ -35,19 +30,7 @@ endif() add_subdirectory(src) if(RE3_INSTALL) - include(CMakePackageConfigHelpers) - configure_package_config_file(cmake/re3-config.cmake.in re3-config.cmake - INSTALL_DESTINATION "${CMAKE_INSTALL_PREFIX}" - ) - install( - FILES "${CMAKE_CURRENT_BINARY_DIR}/re3-config.cmake" - DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" - ) - install( - EXPORT re3-targets - DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" - ) - + install(DIRECTORY gamefiles/ DESTINATION ".") if(LIBRW_PLATFORM_NULL) set(platform "-null") elseif(LIBRW_PLATFORM_PS2) diff --git a/cmake/re3-config.cmake.in b/cmake/re3-config.cmake.in deleted file mode 100644 index 37e81938..00000000 --- a/cmake/re3-config.cmake.in +++ /dev/null @@ -1,5 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/re3-targets.cmake") - -set(RE3_AUDIO "@RE3_AUDIO@") -set(RE3_AUDIOS "@RE3_AUDIOS@") -set(RE3_PLATFORM @LIBRW_PLATFORM@) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2710b5a5..a2052471 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -83,20 +83,20 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang target_compile_options(re3 PRIVATE "-Wall" - ) + ) if (NOT LIBRW_PLATFORM_PS2) target_compile_options(re3 PRIVATE -Wextra -Wdouble-promotion -Wpedantic - ) + ) endif() elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") target_compile_options(re3 PUBLIC /Zc:sizedDealloc- - ) + ) endif() set_target_properties(re3 @@ -107,14 +107,12 @@ set_target_properties(re3 CXX_STANDARD 11 CXX_EXTENSIONS OFF CXX_STANDARD_REQUIRED ON - ) +) if(RE3_INSTALL) install( TARGETS re3 EXPORT re3-targets - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" - ) + RUNTIME DESTINATION "." + ) endif() |