Merge pull request #651 from wolfman2000/wolf-cmake-license-file-change

Put the license file in the CMake folder.
This commit is contained in:
Jason Felds
2015-05-24 21:18:50 -04:00
3 changed files with 2 additions and 1 deletions
+1 -1
View File
@@ -8,7 +8,7 @@ set(CPACK_PACKAGE_VERSION "${SM_VERSION_TRADITIONAL}")
set(CPACK_NSIS_HELP_LINK "https://github.com/stepmania/stepmania/issues")
set(CPACK_NSIS_URL_INFO_ABOUT "http://www.stepmania.com/")
set(CPACK_RESOURCE_FILE_README "${SM_ROOT_DIR}/README.md")
set(CPACK_RESOURCE_FILE_LICENSE "${SM_BUILD_DIR}/license_install.txt")
set(CPACK_RESOURCE_FILE_LICENSE "${SM_CMAKE_DIR}/license_install.txt")
set(CPACK_PACKAGE_EXECUTABLES
"${SM_EXE_NAME}" "StepMania ${SM_VERSION_MAJOR}"
)
+1
View File
@@ -13,6 +13,7 @@ set(SM_XCODE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Xcode")
set(SM_PROGRAM_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Program")
set(SM_BUILD_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Build")
set(SM_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
set(SM_DOC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Docs")
set(SM_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
# TODO: Reconsile the OS dependent naming scheme.