From a2a519f087fe9437d49bdad9644c6c4751e72bf3 Mon Sep 17 00:00:00 2001 From: isanae <14251494+isanae@users.noreply.github.com> Date: Fri, 24 Apr 2020 23:10:00 -0400 Subject: [PATCH] now using new cmakefiles --- CMakeLists.txt | 17 +++++--------- src/CMakeLists.txt | 55 ++-------------------------------------------- 2 files changed, 8 insertions(+), 64 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ce1e49..8f5f5ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,13 +1,8 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.16) -ADD_COMPILE_OPTIONS($<$:/MP> $<$:$<$:/O2>> $<$:$<$:/O2>>) +project(githubpp) +set(project_type lib) +set(enable_warnings OFF) -SET(PROJ_NAME githubpp) -PROJECT(${PROJ_NAME}) - -SET(DEPENDENCIES_DIR CACHE PATH "") - -# hint to find qt in dependencies path -LIST(APPEND CMAKE_PREFIX_PATH ${QT_ROOT}/lib/cmake) - -ADD_SUBDIRECTORY(src) +include(../cmake_common/project.cmake) +add_subdirectory(src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3611d0c..34a61d3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,53 +1,2 @@ -CMAKE_MINIMUM_REQUIRED (VERSION 2.8.11) - -CMAKE_POLICY(SET CMP0020 NEW) -CMAKE_POLICY(SET CMP0043 NEW) - -SET(PROJ_AUTHOR Tannin) -SET(PROJ_ARCH x86) -if(CMAKE_SIZEOF_VOID_P EQUAL 8) - SET(PROJ_ARCH x64) -endif() - - -SET(${PROJ_NAME}_SRCS - github.cpp -) - -SET(${PROJ_NAME}_HDRS - github.h -) - -# Qt5 -SET(CMAKE_INCLUDE_CURRENT_DIR ON) -SET(CMAKE_AUTOMOC ON) -FIND_PACKAGE(Qt5Core REQUIRED) -FIND_PACKAGE(Qt5Network REQUIRED) - -INCLUDE_DIRECTORIES(${Qt5Core_DIR}/../../../include) -INCLUDE_DIRECTORIES(${Qt5Core_DIR}/../../../include/QtCore) - -ADD_DEFINITIONS(-DUNICODE -D_UNICODE) -ADD_LIBRARY(${PROJ_NAME} STATIC ${${PROJ_NAME}_HDRS} ${${PROJ_NAME}_SRCS}) -TARGET_LINK_LIBRARIES(${PROJ_NAME} Qt5::Core Qt5::Network) - -IF (MSVC) - SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES COMPILE_FLAGS "/std:c++latest") -ENDIF() -IF (MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 4) - # 32 bits - SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES LINK_FLAGS "/LARGEADDRESSAWARE") -ENDIF() - -IF (NOT "${OPTIMIZE_COMPILE_FLAGS}" STREQUAL "") - SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES COMPILE_FLAGS_RELWITHDEBINFO ${OPTIMIZE_COMPILE_FLAGS}) -ENDIF() -IF (NOT "${OPTIMIZE_LINK_FLAGS}" STREQUAL "") - SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES LINK_FLAGS_RELWITHDEBINFO ${OPTIMIZE_LINK_FLAGS}) -ENDIF() - -############### -## Installation - -INSTALL(TARGETS ${PROJ_NAME} - ARCHIVE DESTINATION libs) +cmake_minimum_required(VERSION 3.16) +include(../../cmake_common/src.cmake)