From f74a180c323d4905fc637e9cf6cc1b94ba23632f Mon Sep 17 00:00:00 2001 From: Armin Co <armin.co@hs-bochum.de> Date: Sun, 26 Apr 2020 17:18:06 +0200 Subject: [PATCH] CMake configs. --- CMakeLists.txt | 3 ++- gtk_qpong_app/CMakeLists.txt | 6 +++++- qpong_core/CMakeLists.txt | 16 ++++++++-------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b1b255e..8da6cce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,9 +28,10 @@ endif() # Add qpong lib for core qpong functionality add_subdirectory(qpong_core) +include_directories(qpong_core) # Dear ImGui based application -add_subdirectory(imgui_app) +# add_subdirectory(imgui_app) # Add dir with gtk qpong app add_subdirectory(gtk_qpong_app) diff --git a/gtk_qpong_app/CMakeLists.txt b/gtk_qpong_app/CMakeLists.txt index 3da7cc6..3233886 100644 --- a/gtk_qpong_app/CMakeLists.txt +++ b/gtk_qpong_app/CMakeLists.txt @@ -6,7 +6,7 @@ link_directories(${GTKMM_LIBRARY_DIRS}) # get all GTKMM dependencies and configuration include_directories(${GTKMM_INCLUDE_DIRS}) -include_directories(../qpong_core) +# include_directories(../qpong_core) # create the application add_executable( qpong.app @@ -16,11 +16,15 @@ add_executable( qpong.app ParticleImage.cpp ) +find_package(Threads) + # link all necessary libs to the target target_link_libraries( qpong.app qpong_core + ${CMAKE_THREAD_LIBS_INIT} ${GTKMM_LIBRARIES} fftw3 + fftw3_omp m # math ) diff --git a/qpong_core/CMakeLists.txt b/qpong_core/CMakeLists.txt index 01180fb..a5ab638 100644 --- a/qpong_core/CMakeLists.txt +++ b/qpong_core/CMakeLists.txt @@ -7,12 +7,12 @@ add_library( Player.cpp ) -find_package(Threads) +# find_package(Threads) -target_link_libraries( - qpong_core - ${CMAKE_THREAD_LIBS_INIT} - fftw3 - fftw3_omp - m -) \ No newline at end of file +# target_link_libraries( +# qpong_core +# ${CMAKE_THREAD_LIBS_INIT} +# fftw3 +# fftw3_omp +# m +# ) \ No newline at end of file -- GitLab