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

CMake: collect all the Find-modules at top-level

Browse Source
This commit is contained in:
Adriaan de Groot 2017-07-11 06:21:16 -04:00
parent d18e3dc385
commit 6fb40c517a
4 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/modules/users/CMakeModules/FindCrypt.cmake → CMakeModules/FindCrypt.cmake
View File

0
src/modules/welcome/CMakeModules/FindLIBPARTED.cmake → CMakeModules/FindLIBPARTED.cmake
View File

2
src/modules/users/CMakeLists.txt
View File

@ -5,8 +5,6 @@ if( ECM_FOUND )
endif() endif()
find_package( Qt5 COMPONENTS Core Test REQUIRED ) find_package( Qt5 COMPONENTS Core Test REQUIRED )
list( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" )
find_package( Crypt ) find_package( Crypt )
include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ) include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )

2
src/modules/welcome/CMakeLists.txt
View File

@ -1,5 +1,5 @@
include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ) include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules )
find_package( LIBPARTED REQUIRED ) find_package( LIBPARTED REQUIRED )
find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network ) find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network )