From 958ce103272546dad4105cd5bbbd7d894e9a5484 Mon Sep 17 00:00:00 2001 From: Akash Mozumdar Date: Fri, 7 Jun 2019 02:19:51 -0400 Subject: [PATCH] clean up cmake --- CMakeLists.txt | 9 +-------- GUI/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d337997..1f6c8ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,7 @@ cmake_minimum_required(VERSION 3.5) -set(MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cmake) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${MODULE_DIR}) - project(Textractor) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) add_compile_options( /std:c++17 @@ -25,11 +23,6 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY $<1:${CMAKE_FINAL_OUTPUT_DIRECTORY}>) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY $<1:${CMAKE_FINAL_OUTPUT_DIRECTORY}>) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${CMAKE_FINAL_OUTPUT_DIRECTORY}>) -set(CMAKE_CONFIGURATION_TYPES Debug Release) - -file(GLOB LIBS ${LIBDIR}/*) -file(COPY ${LIBS} DESTINATION ${CMAKE_FINAL_OUTPUT_DIRECTORY}) - include_directories(include) link_directories(${LIBDIR}) diff --git a/GUI/CMakeLists.txt b/GUI/CMakeLists.txt index 222bab4..a27c832 100644 --- a/GUI/CMakeLists.txt +++ b/GUI/CMakeLists.txt @@ -2,7 +2,7 @@ include(QtUtils) msvc_registry_search() find_qt5(Core Widgets) -add_executable(${PROJECT_NAME} WIN32 +add_executable(Textractor WIN32 main.cpp mainwindow.cpp extenwindow.cpp