jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

In Cyclop CMakeLists, cleanup the switch Qt4/Qt5.

This commit is contained in:
Jean-Paul Chaput 2019-11-10 12:28:50 +01:00
parent a8a904180d
commit 9d86282b8f
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crlcore/src/cyclop/CMakeLists.txt
View File

@ -1,6 +1,5 @@
# -*- explicit-buffer-name: "CMakeLists.txt<crlcore/src/ccore/cyclop>" -*- # -*- explicit-buffer-name: "CMakeLists.txt<crlcore/src/ccore/cyclop>" -*-
# include ( ${QT_USE_FILE} )
include_directories ( ${CRLCORE_SOURCE_DIR}/src/ccore include_directories ( ${CRLCORE_SOURCE_DIR}/src/ccore
${HURRICANE_INCLUDE_DIR} ${HURRICANE_INCLUDE_DIR}
${UTILITIES_INCLUDE_DIR} ${UTILITIES_INCLUDE_DIR}
@ -11,21 +10,17 @@
set ( mocincludes Cyclop.h set ( mocincludes Cyclop.h
OpenCellDialog.h OpenCellDialog.h
) )
set ( cpps OpenCellDialog.cpp set ( cpps OpenCellDialog.cpp
DemoGo.cpp DemoGo.cpp
Cyclop.cpp Cyclop.cpp
CyclopMain.cpp CyclopMain.cpp
) )
qtX_wrap_cpp ( mocCpps ${mocincludes} ) qtX_wrap_cpp ( moccpps ${mocincludes} )
link_directories ( ${CRLCORE_BINARY_DIR}/src/ccore ) link_directories ( ${CRLCORE_BINARY_DIR}/src/ccore )
#if(NOT WITH_QT5) add_executable ( cyclop ${cpps} ${moccpps} )
list ( APPEND cpps ${mocCpps} )
#endif()
add_executable ( cyclop ${cpps} )
target_link_libraries ( cyclop crlcore target_link_libraries ( cyclop crlcore
${HURRICANE_PYTHON_LIBRARIES} ${HURRICANE_PYTHON_LIBRARIES}
${HURRICANE_GRAPHICAL_LIBRARIES} ${HURRICANE_GRAPHICAL_LIBRARIES}