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

CMake: remove superfluous indirection

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

16
src/libcalamaresui/CMakeLists.txt
View File

@ -1,6 +1,6 @@
set( CALAMARESUI_LIBRARY_TARGET calamaresui ) project( libcalamaresui CXX )
list( APPEND ${CALAMARESUI_LIBRARY_TARGET}_SOURCES list( APPEND calamaresui_SOURCES
modulesystem/CppJobModule.cpp modulesystem/CppJobModule.cpp
modulesystem/Module.cpp modulesystem/Module.cpp
modulesystem/ModuleManager.cpp modulesystem/ModuleManager.cpp
@ -29,12 +29,12 @@ list( APPEND ${CALAMARESUI_LIBRARY_TARGET}_SOURCES
ViewManager.cpp ViewManager.cpp
) )
list( APPEND ${CALAMARESUI_LIBRARY_TARGET}_UI list( APPEND calamaresui_UI
utils/DebugWindow.ui utils/DebugWindow.ui
) )
if( WITH_PYTHON ) if( WITH_PYTHON )
list( APPEND ${CALAMARESUI_LIBRARY_TARGET}_SOURCES list( APPEND calamaresui_SOURCES
modulesystem/PythonJobModule.cpp modulesystem/PythonJobModule.cpp
) )
endif() endif()
@ -43,7 +43,7 @@ if( WITH_PYTHONQT )
include_directories(${PYTHON_INCLUDE_DIRS}) include_directories(${PYTHON_INCLUDE_DIRS})
include_directories(${PYTHONQT_INCLUDE_DIR}) include_directories(${PYTHONQT_INCLUDE_DIR})
list( APPEND ${CALAMARESUI_LIBRARY_TARGET}_SOURCES list( APPEND calamaresui_SOURCES
modulesystem/PythonQtViewModule.cpp modulesystem/PythonQtViewModule.cpp
utils/PythonQtUtils.cpp utils/PythonQtUtils.cpp
viewpages/PythonQtJob.cpp viewpages/PythonQtJob.cpp
@ -58,9 +58,9 @@ if( WITH_PYTHONQT )
) )
endif() endif()
calamares_add_library( ${CALAMARESUI_LIBRARY_TARGET} calamares_add_library( calamaresui
SOURCES ${${CALAMARESUI_LIBRARY_TARGET}_SOURCES} SOURCES ${calamaresui_SOURCES}
UI ${${CALAMARESUI_LIBRARY_TARGET}_UI} UI ${calamaresui_UI}
EXPORT_MACRO UIDLLEXPORT_PRO EXPORT_MACRO UIDLLEXPORT_PRO
LINK_PRIVATE_LIBRARIES LINK_PRIVATE_LIBRARIES
${YAMLCPP_LIBRARY} ${YAMLCPP_LIBRARY}