teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Remove duplicate macro definition and fix warning

Browse source
This commit is contained in:
AnyOldName3 2017-10-12 02:45:50 +01:00
parent 2652a89df4
commit f9a3562ccd
3 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmake/GitVersion.cmake
View file

@ -26,16 +26,6 @@ else ()
message(WARNING "Failed to get valid version information from Git") message(WARNING "Failed to get valid version information from Git")
endif () endif ()
# duplicated from OpenMWMacros.cmake include(${MACROSFILE})
macro (configure_resource_file source_path destination_dir_base dest_path_relative)
if (MSVC)
configure_file(${source_path} "${destination_dir_base}/Debug/${dest_path_relative}")
configure_file(${source_path} "${destination_dir_base}/Release/${dest_path_relative}")
configure_file(${source_path} "${destination_dir_base}/RelWithDebInfo/${dest_path_relative}")
configure_file(${source_path} "${destination_dir_base}/MinSizeRel/${dest_path_relative}")
else (MSVC)
configure_file(${source_path} "${destination_dir_base}/${dest_path_relative}")
endif (MSVC)
endmacro (configure_resource_file)
configure_resource_file(${VERSION_IN_FILE} ${VERSION_FILE_PATH_BASE} ${VERSION_FILE_PATH_RELATIVE}) configure_resource_file(${VERSION_IN_FILE} ${VERSION_FILE_PATH_BASE} ${VERSION_FILE_PATH_RELATIVE})

2
cmake/OpenMWMacros.cmake
View file

@ -199,4 +199,4 @@ macro (copy_all_resource_files source_dir destination_dir_base destination_dir_r
get_filename_component(filename ${f} NAME) get_filename_component(filename ${f} NAME)
copy_resource_file("${source_dir}/${f}" "${destination_dir_base}" "${destination_dir_relative}/${filename}") copy_resource_file("${source_dir}/${f}" "${destination_dir_base}" "${destination_dir_relative}/${filename}")
endforeach (f) endforeach (f)
endmacro (copy_all_files) endmacro (copy_all_resource_files)

1
components/CMakeLists.txt
View file

@ -17,6 +17,7 @@ if (GIT_CHECKOUT)
-DOPENMW_VERSION_RELEASE=${OPENMW_VERSION_RELEASE} -DOPENMW_VERSION_RELEASE=${OPENMW_VERSION_RELEASE}
-DOPENMW_VERSION=${OPENMW_VERSION} -DOPENMW_VERSION=${OPENMW_VERSION}
-DMSVC=${MSVC} -DMSVC=${MSVC}
-DMACROSFILE=${CMAKE_SOURCE_DIR}/cmake/OpenMWMacros.cmake
-P ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/GitVersion.cmake -P ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/GitVersion.cmake
VERBATIM) VERBATIM)
else (GIT_CHECKOUT) else (GIT_CHECKOUT)