rubenwardy
/
TGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake exported files in wrong location in build folder after change from last commit

0.8
Bruno Van de Velde 2018-10-11 20:03:47 +02:00
parent 3f03917cb8
commit 232f2b316d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/Macros.cmake
View File

@ -72,9 +72,9 @@ function(tgui_export_target export_name)
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
if(CMAKE_VERSION VERSION_LESS 3.11) if(CMAKE_VERSION VERSION_LESS 3.11)
set(CVF_VERSION ${TGUI_VERSION_MAJOR}.${TGUI_VERSION_MINOR}.${TGUI_VERSION_PATCH}) set(CVF_VERSION ${TGUI_VERSION_MAJOR}.${TGUI_VERSION_MINOR}.${TGUI_VERSION_PATCH})
configure_file("${PROJECT_SOURCE_DIR}/cmake/TGUIConfigVersion.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/TGUIConfigVersion.cmake" @ONLY) configure_file("${PROJECT_SOURCE_DIR}/cmake/TGUIConfigVersion.cmake.in" "${PROJECT_BINARY_DIR}/TGUIConfigVersion.cmake" @ONLY)
else() else()
write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/TGUIConfigVersion.cmake" write_basic_package_version_file("${PROJECT_BINARY_DIR}/TGUIConfigVersion.cmake"
VERSION ${TGUI_VERSION_MAJOR}.${TGUI_VERSION_MINOR}.${TGUI_VERSION_PATCH} VERSION ${TGUI_VERSION_MAJOR}.${TGUI_VERSION_MINOR}.${TGUI_VERSION_PATCH}
COMPATIBILITY SameMinorVersion) COMPATIBILITY SameMinorVersion)
endif() endif()
@ -86,22 +86,22 @@ function(tgui_export_target export_name)
endif() endif()
export(EXPORT ${export_name} export(EXPORT ${export_name}
FILE "${CMAKE_CURRENT_BINARY_DIR}/${targets_config_filename}") FILE "${PROJECT_BINARY_DIR}/${targets_config_filename}")
if (TGUI_BUILD_FRAMEWORK) if (TGUI_BUILD_FRAMEWORK)
set(config_package_location "TGUI.framework/Resources/CMake") set(config_package_location "TGUI.framework/Resources/CMake")
else() else()
set(config_package_location lib${LIB_SUFFIX}/cmake/TGUI) set(config_package_location lib${LIB_SUFFIX}/cmake/TGUI)
endif() endif()
configure_package_config_file("${PROJECT_SOURCE_DIR}/cmake/TGUIConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/TGUIConfig.cmake" configure_package_config_file("${PROJECT_SOURCE_DIR}/cmake/TGUIConfig.cmake.in" "${PROJECT_BINARY_DIR}/TGUIConfig.cmake"
INSTALL_DESTINATION "${config_package_location}") INSTALL_DESTINATION "${config_package_location}")
install(EXPORT ${export_name} install(EXPORT ${export_name}
FILE ${targets_config_filename} FILE ${targets_config_filename}
DESTINATION ${config_package_location}) DESTINATION ${config_package_location})
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/TGUIConfig.cmake" install(FILES "${PROJECT_BINARY_DIR}/TGUIConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/TGUIConfigVersion.cmake" "${PROJECT_BINARY_DIR}/TGUIConfigVersion.cmake"
DESTINATION ${config_package_location} DESTINATION ${config_package_location}
COMPONENT devel) COMPONENT devel)
endfunction() endfunction()