Use CMAKE_CURRENT_SOURCE_DIR instead of CMAKE_SOURCE_DIR

macos_ci_fix
Andrei Kortunov 1 year ago
parent 2e041073fc
commit e6690bbcc7

@ -35,12 +35,12 @@ set(LAUNCHER_HEADER
# Headers that must be pre-processed # Headers that must be pre-processed
set(LAUNCHER_UI set(LAUNCHER_UI
${CMAKE_SOURCE_DIR}/apps/launcher/ui/datafilespage.ui ${CMAKE_CURRENT_SOURCE_DIR}/ui/datafilespage.ui
${CMAKE_SOURCE_DIR}/apps/launcher/ui/graphicspage.ui ${CMAKE_CURRENT_SOURCE_DIR}/ui/graphicspage.ui
${CMAKE_SOURCE_DIR}/apps/launcher/ui/mainwindow.ui ${CMAKE_CURRENT_SOURCE_DIR}/ui/mainwindow.ui
${CMAKE_SOURCE_DIR}/apps/launcher/ui/importpage.ui ${CMAKE_CURRENT_SOURCE_DIR}/ui/importpage.ui
${CMAKE_SOURCE_DIR}/apps/launcher/ui/settingspage.ui ${CMAKE_CURRENT_SOURCE_DIR}/ui/settingspage.ui
${CMAKE_SOURCE_DIR}/apps/launcher/ui/directorypicker.ui ${CMAKE_CURRENT_SOURCE_DIR}/ui/directorypicker.ui
${CMAKE_SOURCE_DIR}/components/contentselector/contentselector.ui ${CMAKE_SOURCE_DIR}/components/contentselector/contentselector.ui
) )

@ -140,7 +140,7 @@ set (OPENCS_RES ${CMAKE_SOURCE_DIR}/files/opencs/resources.qrc
set (OPENCS_UI set (OPENCS_UI
${CMAKE_SOURCE_DIR}/components/contentselector/contentselector.ui ${CMAKE_SOURCE_DIR}/components/contentselector/contentselector.ui
${CMAKE_SOURCE_DIR}/apps/opencs/ui/filedialog.ui ${CMAKE_CURRENT_SOURCE_DIR}/ui/filedialog.ui
) )
source_group (openmw-cs FILES main.cpp ${OPENCS_SRC} ${OPENCS_HDR}) source_group (openmw-cs FILES main.cpp ${OPENCS_SRC} ${OPENCS_HDR})

@ -34,20 +34,20 @@ set(WIZARD_HEADER
) )
set(WIZARD_UI set(WIZARD_UI
${CMAKE_SOURCE_DIR}/apps/wizard/ui/componentselectionpage.ui ${CMAKE_CURRENT_SOURCE_DIR}/ui/componentselectionpage.ui
${CMAKE_SOURCE_DIR}/apps/wizard/ui/conclusionpage.ui ${CMAKE_CURRENT_SOURCE_DIR}/ui/conclusionpage.ui
${CMAKE_SOURCE_DIR}/apps/wizard/ui/existinginstallationpage.ui ${CMAKE_CURRENT_SOURCE_DIR}/ui/existinginstallationpage.ui
${CMAKE_SOURCE_DIR}/apps/wizard/ui/importpage.ui ${CMAKE_CURRENT_SOURCE_DIR}/ui/importpage.ui
${CMAKE_SOURCE_DIR}/apps/wizard/ui/installationtargetpage.ui ${CMAKE_CURRENT_SOURCE_DIR}/ui/installationtargetpage.ui
${CMAKE_SOURCE_DIR}/apps/wizard/ui/intropage.ui ${CMAKE_CURRENT_SOURCE_DIR}/ui/intropage.ui
${CMAKE_SOURCE_DIR}/apps/wizard/ui/languageselectionpage.ui ${CMAKE_CURRENT_SOURCE_DIR}/ui/languageselectionpage.ui
${CMAKE_SOURCE_DIR}/apps/wizard/ui/methodselectionpage.ui ${CMAKE_CURRENT_SOURCE_DIR}/ui/methodselectionpage.ui
) )
if (OPENMW_USE_UNSHIELD) if (OPENMW_USE_UNSHIELD)
set (WIZARD ${WIZARD} installationpage.cpp unshield/unshieldworker.cpp) set (WIZARD ${WIZARD} installationpage.cpp unshield/unshieldworker.cpp)
set (WIZARD_HEADER ${WIZARD_HEADER} installationpage.hpp unshield/unshieldworker.hpp) set (WIZARD_HEADER ${WIZARD_HEADER} installationpage.hpp unshield/unshieldworker.hpp)
set (WIZARD_UI ${WIZARD_UI} ${CMAKE_SOURCE_DIR}/apps/wizard/ui/installationpage.ui) set (WIZARD_UI ${WIZARD_UI} ${CMAKE_CURRENT_SOURCE_DIR}/ui/installationpage.ui)
add_definitions(-DOPENMW_USE_UNSHIELD) add_definitions(-DOPENMW_USE_UNSHIELD)
endif (OPENMW_USE_UNSHIELD) endif (OPENMW_USE_UNSHIELD)

@ -490,7 +490,7 @@ else ()
) )
endif() endif()
set (ESM_UI ${CMAKE_SOURCE_DIR}/components/contentselector/contentselector.ui set (ESM_UI ${CMAKE_CURRENT_SOURCE_DIR}/contentselector/contentselector.ui
) )
if (USE_QT) if (USE_QT)

Loading…
Cancel
Save