From 42e43837ee2bef1a85132a81389c8401e9f97bc9 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Fri, 10 Aug 2018 13:38:39 +0200
Subject: [PATCH] remove "ThirdParty" from include statements
---
Framework/Geometry/CMakeLists.txt | 4 ++--
Framework/Geometry/testGeometry.cc | 4 +---
Framework/Units/CMakeLists.txt | 1 -
Framework/Units/PhysicalUnits.h | 11 +++++++----
Framework/Units/testUnits.cc | 4 +---
ThirdParty/CMakeLists.txt | 6 +++---
6 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/Framework/Geometry/CMakeLists.txt b/Framework/Geometry/CMakeLists.txt
index a1f8a8bb6..eb7fb3650 100644
--- a/Framework/Geometry/CMakeLists.txt
+++ b/Framework/Geometry/CMakeLists.txt
@@ -8,7 +8,7 @@ set_target_properties (CORSIKAgeometry PROPERTIES VERSION ${PROJECT_VERSION})
set_target_properties (CORSIKAgeometry PROPERTIES SOVERSION 1)
set_target_properties (CORSIKAgeometry PROPERTIES PUBLIC_HEADER "${GEOMETRY_HEADERS}")
-
+
# target dependencies on other libraries (also header only)
target_link_libraries (CORSIKAgeometry CORSIKAunits)
@@ -17,7 +17,7 @@ target_include_directories (CORSIKAgeometry INTERFACE ${EIGEN3_INCLUDE_DIR})
target_include_directories (CORSIKAgeometry INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/Framework>
$<INSTALL_INTERFACE:include/Framework>
)
-
+
install (TARGETS CORSIKAgeometry
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
diff --git a/Framework/Geometry/testGeometry.cc b/Framework/Geometry/testGeometry.cc
index d5a34b787..b85d35327 100644
--- a/Framework/Geometry/testGeometry.cc
+++ b/Framework/Geometry/testGeometry.cc
@@ -1,11 +1,9 @@
#define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one cpp file
-#include <ThirdParty/catch2/catch.hpp>
+#include <catch2/catch.hpp>
#include <Units/PhysicalUnits.h>
using namespace phys::units;
-using namespace phys::units::io;
-using namespace phys::units::literals;
TEST_CASE( "PhysicalUnits", "[Units]" )
{
diff --git a/Framework/Units/CMakeLists.txt b/Framework/Units/CMakeLists.txt
index d7d3af7ed..7881afc4f 100644
--- a/Framework/Units/CMakeLists.txt
+++ b/Framework/Units/CMakeLists.txt
@@ -5,7 +5,6 @@ target_include_directories (CORSIKAunits
INTERFACE
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/Framework>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/ThirdParty>
- $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
$<INSTALL_INTERFACE:include>
)
diff --git a/Framework/Units/PhysicalUnits.h b/Framework/Units/PhysicalUnits.h
index 91f741a7f..83ed903f9 100644
--- a/Framework/Units/PhysicalUnits.h
+++ b/Framework/Units/PhysicalUnits.h
@@ -1,16 +1,19 @@
#ifndef _include_PhysicalUnits_h_
#define _include_PhysicalUnits_h_
-#include <ThirdParty/phys/units/quantity.hpp>
-#include <ThirdParty/phys/units/io.hpp>
-#include <ThirdParty/phys/units/physical_constants.hpp>
+#include <phys/units/quantity.hpp>
+#include <phys/units/io.hpp>
+#include <phys/units/physical_constants.hpp>
/**
- /file PhysicalUnits
+ @file PhysicalUnits
Define _XeV literals, alowing 10_GeV in the code.
*/
+using namespace phys::units::io;
+using namespace phys::units::literals;
+
namespace phys {
namespace units {
namespace literals {
diff --git a/Framework/Units/testUnits.cc b/Framework/Units/testUnits.cc
index eeae88d0f..3206c5095 100644
--- a/Framework/Units/testUnits.cc
+++ b/Framework/Units/testUnits.cc
@@ -1,11 +1,9 @@
#define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one cpp file
-#include <ThirdParty/catch2/catch.hpp>
+#include <catch2/catch.hpp>
#include <Units/PhysicalUnits.h>
using namespace phys::units;
-using namespace phys::units::io;
-using namespace phys::units::literals;
TEST_CASE( "PhysicalUnits", "[Units]" ) {
REQUIRE( 1_m/1_m == 1 );
diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt
index 8279a6449..c7f90c5b9 100644
--- a/ThirdParty/CMakeLists.txt
+++ b/ThirdParty/CMakeLists.txt
@@ -1,10 +1,10 @@
add_library (CORSIKAthirdparty INTERFACE)
-target_include_directories (CORSIKAthirdparty
+target_include_directories (CORSIKAthirdparty SYSTEM
INTERFACE
- $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/>
- $<INSTALL_INTERFACE:include/>
+ $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/ThirdParty>
+ $<INSTALL_INTERFACE:include/ThirdParty>
)
install (DIRECTORY phys DESTINATION include/ThirdParty/)
--
GitLab