From 9d86282b8ff23d76313cccc3c1b4add869a90c17 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Sun, 10 Nov 2019 12:28:50 +0100 Subject: [PATCH] In Cyclop CMakeLists, cleanup the switch Qt4/Qt5. --- crlcore/src/cyclop/CMakeLists.txt | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/crlcore/src/cyclop/CMakeLists.txt b/crlcore/src/cyclop/CMakeLists.txt index 9c04318d..0b1ca214 100644 --- a/crlcore/src/cyclop/CMakeLists.txt +++ b/crlcore/src/cyclop/CMakeLists.txt @@ -1,6 +1,5 @@ # -*- explicit-buffer-name: "CMakeLists.txt" -*- -# include ( ${QT_USE_FILE} ) include_directories ( ${CRLCORE_SOURCE_DIR}/src/ccore ${HURRICANE_INCLUDE_DIR} ${UTILITIES_INCLUDE_DIR} @@ -11,21 +10,17 @@ set ( mocincludes Cyclop.h OpenCellDialog.h ) - set ( cpps OpenCellDialog.cpp + set ( cpps OpenCellDialog.cpp DemoGo.cpp Cyclop.cpp CyclopMain.cpp ) - qtX_wrap_cpp ( mocCpps ${mocincludes} ) + qtX_wrap_cpp ( moccpps ${mocincludes} ) link_directories ( ${CRLCORE_BINARY_DIR}/src/ccore ) -#if(NOT WITH_QT5) - list ( APPEND cpps ${mocCpps} ) -#endif() - - add_executable ( cyclop ${cpps} ) + add_executable ( cyclop ${cpps} ${moccpps} ) target_link_libraries ( cyclop crlcore ${HURRICANE_PYTHON_LIBRARIES} ${HURRICANE_GRAPHICAL_LIBRARIES}