IAP GITLAB

Skip to content
Snippets Groups Projects
Commit 42e43837 authored by ralfulrich's avatar ralfulrich
Browse files

remove "ThirdParty" from include statements

parent 0d0ad008
No related branches found
No related tags found
No related merge requests found
...@@ -8,7 +8,7 @@ set_target_properties (CORSIKAgeometry PROPERTIES VERSION ${PROJECT_VERSION}) ...@@ -8,7 +8,7 @@ set_target_properties (CORSIKAgeometry PROPERTIES VERSION ${PROJECT_VERSION})
set_target_properties (CORSIKAgeometry PROPERTIES SOVERSION 1) set_target_properties (CORSIKAgeometry PROPERTIES SOVERSION 1)
set_target_properties (CORSIKAgeometry PROPERTIES PUBLIC_HEADER "${GEOMETRY_HEADERS}") set_target_properties (CORSIKAgeometry PROPERTIES PUBLIC_HEADER "${GEOMETRY_HEADERS}")
# target dependencies on other libraries (also header only) # target dependencies on other libraries (also header only)
target_link_libraries (CORSIKAgeometry CORSIKAunits) target_link_libraries (CORSIKAgeometry CORSIKAunits)
...@@ -17,7 +17,7 @@ target_include_directories (CORSIKAgeometry INTERFACE ${EIGEN3_INCLUDE_DIR}) ...@@ -17,7 +17,7 @@ target_include_directories (CORSIKAgeometry INTERFACE ${EIGEN3_INCLUDE_DIR})
target_include_directories (CORSIKAgeometry INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/Framework> target_include_directories (CORSIKAgeometry INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/Framework>
$<INSTALL_INTERFACE:include/Framework> $<INSTALL_INTERFACE:include/Framework>
) )
install (TARGETS CORSIKAgeometry install (TARGETS CORSIKAgeometry
LIBRARY DESTINATION lib LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib ARCHIVE DESTINATION lib
......
#define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one cpp file #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> #include <Units/PhysicalUnits.h>
using namespace phys::units; using namespace phys::units;
using namespace phys::units::io;
using namespace phys::units::literals;
TEST_CASE( "PhysicalUnits", "[Units]" ) TEST_CASE( "PhysicalUnits", "[Units]" )
{ {
......
...@@ -5,7 +5,6 @@ target_include_directories (CORSIKAunits ...@@ -5,7 +5,6 @@ target_include_directories (CORSIKAunits
INTERFACE INTERFACE
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/Framework> $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/Framework>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/ThirdParty> $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/ThirdParty>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
) )
......
#ifndef _include_PhysicalUnits_h_ #ifndef _include_PhysicalUnits_h_
#define _include_PhysicalUnits_h_ #define _include_PhysicalUnits_h_
#include <ThirdParty/phys/units/quantity.hpp> #include <phys/units/quantity.hpp>
#include <ThirdParty/phys/units/io.hpp> #include <phys/units/io.hpp>
#include <ThirdParty/phys/units/physical_constants.hpp> #include <phys/units/physical_constants.hpp>
/** /**
/file PhysicalUnits @file PhysicalUnits
Define _XeV literals, alowing 10_GeV in the code. Define _XeV literals, alowing 10_GeV in the code.
*/ */
using namespace phys::units::io;
using namespace phys::units::literals;
namespace phys { namespace phys {
namespace units { namespace units {
namespace literals { namespace literals {
......
#define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one cpp file #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> #include <Units/PhysicalUnits.h>
using namespace phys::units; using namespace phys::units;
using namespace phys::units::io;
using namespace phys::units::literals;
TEST_CASE( "PhysicalUnits", "[Units]" ) { TEST_CASE( "PhysicalUnits", "[Units]" ) {
REQUIRE( 1_m/1_m == 1 ); REQUIRE( 1_m/1_m == 1 );
......
add_library (CORSIKAthirdparty INTERFACE) add_library (CORSIKAthirdparty INTERFACE)
target_include_directories (CORSIKAthirdparty target_include_directories (CORSIKAthirdparty SYSTEM
INTERFACE INTERFACE
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/> $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/ThirdParty>
$<INSTALL_INTERFACE:include/> $<INSTALL_INTERFACE:include/ThirdParty>
) )
install (DIRECTORY phys DESTINATION include/ThirdParty/) install (DIRECTORY phys DESTINATION include/ThirdParty/)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment