From 0df7adb6804a13dd68a349eb5603b9def109f385 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 18 Jan 2018 10:43:05 -0500 Subject: cmake: set the minimum version before the project call --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dbae2f1..52a8f5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ -project(pugixml) - cmake_minimum_required(VERSION 2.8.12) +project(pugixml) + option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF) option(BUILD_TESTS "Build tests" OFF) option(BUILD_PKGCONFIG "Build in PKGCONFIG mode" OFF) -- cgit v1.2.3 From 7fcfb72dcdc03c34bded22348dfd4230cce61540 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 18 Jan 2018 10:43:05 -0500 Subject: cmake: keep sources and headers separate --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 52a8f5e..cc1961d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ include(GNUInstallDirs) mark_as_advanced(CLEAR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_INCLUDEDIR) set(HEADERS src/pugixml.hpp src/pugiconfig.hpp) -set(SOURCES ${HEADERS} src/pugixml.cpp) +set(SOURCES src/pugixml.cpp) if(DEFINED BUILD_DEFINES) foreach(DEFINE ${BUILD_DEFINES}) @@ -37,9 +37,9 @@ if(DEFINED BUILD_DEFINES) endif() if(BUILD_SHARED_LIBS) - add_library(pugixml SHARED ${SOURCES}) + add_library(pugixml SHARED ${HEADERS} ${SOURCES}) else() - add_library(pugixml STATIC ${SOURCES}) + add_library(pugixml STATIC ${HEADERS} ${SOURCES}) endif() # Export symbols for shared library builds -- cgit v1.2.3