napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: shuffle includes, drop useless (empty) QT_INCLUDE_DIR

Browse Source
This commit is contained in:
Adriaan de Groot 2017-09-18 12:32:37 +02:00
parent ddf7b7fc90
commit eede92646d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/CMakeLists.txt
View File

@ -3,17 +3,18 @@ include( CalamaresAddModuleSubdirectory )
include( CalamaresAddLibrary ) include( CalamaresAddLibrary )
include( CalamaresAddBrandingSubdirectory ) include( CalamaresAddBrandingSubdirectory )
include_directories( ${CMAKE_CURRENT_BINARY_DIR}/libcalamares ) include_directories(
include_directories( ${CMAKE_CURRENT_LIST_DIR}/libcalamares ) ${CMAKE_CURRENT_LIST_DIR}
${CMAKE_CURRENT_LIST_DIR}/libcalamares
include_directories( ${CMAKE_CURRENT_BINARY_DIR} ) ${CMAKE_CURRENT_LIST_DIR}/libcalamaresui
include_directories( ${CMAKE_CURRENT_LIST_DIR} ) ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/libcalamares
${CMAKE_CURRENT_BINARY_DIR}/libcalamaresui
)
# library # library
add_subdirectory( libcalamares ) add_subdirectory( libcalamares )
include_directories( ${CMAKE_CURRENT_BINARY_DIR}/libcalamaresui )
include_directories( ${CMAKE_CURRENT_LIST_DIR}/libcalamaresui )
add_subdirectory( libcalamaresui ) add_subdirectory( libcalamaresui )
# all things qml # all things qml

1
src/libcalamares/CMakeLists.txt
View File

@ -36,7 +36,6 @@ set( utilSources
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${QT_INCLUDE_DIR}
) )