Commit 61e3bde0 authored by Tobias WEBER's avatar Tobias WEBER

cosmetic changes

parent 936f2911
...@@ -84,10 +84,11 @@ if(SEARCH_PY) ...@@ -84,10 +84,11 @@ if(SEARCH_PY)
find_package(Python3 COMPONENTS Interpreter Development) find_package(Python3 COMPONENTS Interpreter Development)
endif() endif()
set(Py_FOUND FALSE)
if(Python3_Interpreter_FOUND AND Python3_Development_FOUND) if(Python3_Interpreter_FOUND AND Python3_Development_FOUND)
list(APPEND BOOST_OPT_COMPS python3 python37 python36) list(APPEND BOOST_OPT_COMPS python3 python38 python37 python36)
set(Py_FOUND TRUE) set(Py_FOUND TRUE)
else()
set(Py_FOUND FALSE)
endif() endif()
...@@ -104,11 +105,14 @@ find_package(BZip2) ...@@ -104,11 +105,14 @@ find_package(BZip2)
if(Py_FOUND) if(Py_FOUND)
if(TARGET Boost::python3) if(TARGET Boost::python3)
set(_BOOST_PY_TARGET Boost::python3) set(_BOOST_PY_TARGET Boost::python3)
elseif(TARGET Boost::python38)
set(_BOOST_PY_TARGET Boost::python38)
elseif(TARGET Boost::python37) elseif(TARGET Boost::python37)
set(_BOOST_PY_TARGET Boost::python37) set(_BOOST_PY_TARGET Boost::python37)
elseif(TARGET Boost::python36) elseif(TARGET Boost::python36)
set(_BOOST_PY_TARGET Boost::python36) set(_BOOST_PY_TARGET Boost::python36)
else() else()
message("Boost.Python not found.")
set(Py_FOUND FALSE) set(Py_FOUND FALSE)
endif() endif()
endif() endif()
......
...@@ -12,11 +12,11 @@ find_library(Clipper_LIBRARIES ...@@ -12,11 +12,11 @@ find_library(Clipper_LIBRARIES
) )
if(Clipper_LIBRARIES) if(Clipper_LIBRARIES)
set(Clipper_FOUND 1) set(Clipper_FOUND TRUE)
message("Clipper include directories: ${Clipper_INCLUDE_DIRS}") message("Clipper include directories: ${Clipper_INCLUDE_DIRS}")
message("Clipper library: ${Clipper_LIBRARIES}") message("Clipper library: ${Clipper_LIBRARIES}")
else() else()
set(Clipper_FOUND 0) set(Clipper_FOUND FALSE)
set(Clipper_INCLUDE_DIRS "") set(Clipper_INCLUDE_DIRS "")
set(Clipper_LIBRARIES "") set(Clipper_LIBRARIES "")
message("Error: Clipper could not be found!") message("Error: Clipper could not be found!")
......
...@@ -5,9 +5,9 @@ find_library(Dl_LIBRARIES ...@@ -5,9 +5,9 @@ find_library(Dl_LIBRARIES
) )
if(Dl_LIBRARIES) if(Dl_LIBRARIES)
set(Dl_FOUND 1) set(Dl_FOUND TRUE)
message("DL library: ${Dl_LIBRARIES}") message("DL library: ${Dl_LIBRARIES}")
else() else()
set(Dl_FOUND 0) set(Dl_FOUND FALSE)
message("Error: libdl could not be found!") message("Error: libdl could not be found!")
endif() endif()
...@@ -15,12 +15,12 @@ find_library(Julia_LIBRARIES ...@@ -15,12 +15,12 @@ find_library(Julia_LIBRARIES
) )
if(Julia_INCLUDE_DIRS AND Julia_LIBRARIES) if(Julia_INCLUDE_DIRS AND Julia_LIBRARIES)
set(Julia_FOUND 1) set(Julia_FOUND TRUE)
message("Julia include directories: ${Julia_INCLUDE_DIRS}") message("Julia include directories: ${Julia_INCLUDE_DIRS}")
message("Julia library: ${Julia_LIBRARIES}") message("Julia library: ${Julia_LIBRARIES}")
else() else()
set(Julia_FOUND 0) set(Julia_FOUND FALSE)
message("Error: Julia could not be found!") message("Error: Julia could not be found!")
endif() endif()
...@@ -15,12 +15,12 @@ find_library(QWT_LIBRARIES ...@@ -15,12 +15,12 @@ find_library(QWT_LIBRARIES
) )
if(QWT_INCLUDE_DIRS AND QWT_LIBRARIES) if(QWT_INCLUDE_DIRS AND QWT_LIBRARIES)
set(QWT_FOUND 1) set(QWT_FOUND TRUE)
message("Qwt include directories: ${QWT_INCLUDE_DIRS}") message("Qwt include directories: ${QWT_INCLUDE_DIRS}")
message("Qwt library: ${QWT_LIBRARIES}") message("Qwt library: ${QWT_LIBRARIES}")
else() else()
set(QWT_FOUND 0) set(QWT_FOUND FALSE)
message("Error: Qwt could not be found!") message("Error: Qwt could not be found!")
endif() endif()
...@@ -5,10 +5,10 @@ find_library(Rt_LIBRARIES ...@@ -5,10 +5,10 @@ find_library(Rt_LIBRARIES
) )
if(Rt_LIBRARIES) if(Rt_LIBRARIES)
set(Rt_FOUND 1) set(Rt_FOUND TRUE)
message("RT library: ${Rt_LIBRARIES}") message("RT library: ${Rt_LIBRARIES}")
else() else()
set(Rt_FOUND 0) set(Rt_FOUND FALSE)
message("Error: librt could not be found!") message("Error: librt could not be found!")
endif() endif()
...@@ -21,9 +21,9 @@ find_library(Mp_LIBRARIES ...@@ -21,9 +21,9 @@ find_library(Mp_LIBRARIES
) )
if(Mp_LIBRARIES) if(Mp_LIBRARIES)
set(Mp_FOUND 1) set(Mp_FOUND TRUE)
message("MP library: ${Mp_LIBRARIES}") message("MP library: ${Mp_LIBRARIES}")
else() else()
set(Mp_FOUND 0) set(Mp_FOUND FALSE)
message("Error: libgomp could not be found!") message("Error: libgomp could not be found!")
endif() endif()
...@@ -797,6 +797,8 @@ obj/AboutDlg.o: dialogs/AboutDlg.cpp dialogs/AboutDlg.h ...@@ -797,6 +797,8 @@ obj/AboutDlg.o: dialogs/AboutDlg.cpp dialogs/AboutDlg.h
clean: clean:
find bin -regex 'bin/[_a-zA-Z0-9]*' | xargs rm -f find bin -regex 'bin/[_a-zA-Z0-9]*' | xargs rm -f
rm -f bin/*.exe rm -f bin/*.exe
rm -f plugins/*.so
rm -f plugins/*.dll
rm -f obj/*.o rm -f obj/*.o
rm -f ui/*.h rm -f ui/*.h
rm -f *.moc rm -f *.moc
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment