ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-01-27 05:10:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tracer' of geras.asc.tuwien.ac.at:jschoeberl/netgen into tracer

Browse Source
This commit is contained in:
Christopher Lackner 2019-01-07 13:20:54 +01:00
commit e3a3efaf32
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libsrc/core/utils.hpp
View File

@ -4,7 +4,12 @@
#include <chrono> #include <chrono>
#include <sstream> #include <sstream>
#include <string> #include <string>
#ifdef WIN32
#include <intrin.h> // for __rdtsc() CPU time step counter
#else
#include <x86intrin.h> // for __rdtsc() CPU time step counter #include <x86intrin.h> // for __rdtsc() CPU time step counter
#endif // WIN32
#include "ngcore_api.hpp" // for NGCORE_API #include "ngcore_api.hpp" // for NGCORE_API

3
libsrc/gprim/CMakeLists.txt
View File

@ -3,9 +3,6 @@ add_library(gprim OBJECT
adtree.cpp geom2d.cpp geom3d.cpp geomfuncs.cpp adtree.cpp geom2d.cpp geom3d.cpp geomfuncs.cpp
geomtest3d.cpp transform3d.cpp spline.cpp splinegeometry.cpp geomtest3d.cpp transform3d.cpp spline.cpp splinegeometry.cpp
) )
if(NOT WIN32)
target_link_libraries(gprim ngcore)
endif(NOT WIN32)
set_target_properties( gprim PROPERTIES POSITION_INDEPENDENT_CODE ON ) set_target_properties( gprim PROPERTIES POSITION_INDEPENDENT_CODE ON )

4
libsrc/linalg/CMakeLists.txt
View File

@ -4,10 +4,6 @@ add_library( la OBJECT
set_target_properties(la PROPERTIES POSITION_INDEPENDENT_CODE ON ) set_target_properties(la PROPERTIES POSITION_INDEPENDENT_CODE ON )
if(NOT WIN32)
target_link_libraries(la ngcore)
endif(NOT WIN32)
install(FILES install(FILES
densemat.hpp linalg.hpp opti.hpp densemat.hpp linalg.hpp opti.hpp
polynomial.hpp vector.hpp polynomial.hpp vector.hpp