61b9bb0f59
* Upgrade cppitertools, spdlog, fmt, rapidcheck * Make compilation work on both v4 and v5 toolchains
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index ee9b58c..31359a9 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -48,7 +48,7 @@ option(LIBRDTSC_USE_PMU "Enables PMU usage on ARM platforms" OFF)
|
|
# | Library Build and Install Properties |
|
|
# +--------------------------------------------------------+
|
|
|
|
-add_library(rdtsc SHARED
|
|
+add_library(rdtsc
|
|
src/cycles.c
|
|
src/common_timer.c
|
|
src/timer.c
|
|
@@ -72,15 +72,6 @@ target_include_directories(rdtsc
|
|
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
|
|
)
|
|
|
|
-# Install directory changes depending on build mode
|
|
-if (CMAKE_BUILD_TYPE MATCHES "^[Dd]ebug")
|
|
- # During debug, the library will be installed into a local directory
|
|
- set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_install CACHE PATH "" FORCE)
|
|
-else ()
|
|
- # This will install in /usr/lib and /usr/include
|
|
- set(CMAKE_INSTALL_PREFIX /usr CACHE PATH "" FORCE)
|
|
-endif ()
|
|
-
|
|
# Specifying what to export when installing (GNUInstallDirs required)
|
|
install(TARGETS rdtsc
|
|
EXPORT librstsc-config
|
|
diff --git a/include/librdtsc/common_timer.h b/include/librdtsc/common_timer.h
|
|
index a6922d8..080dc77 100644
|
|
--- a/include/librdtsc/common_timer.h
|
|
+++ b/include/librdtsc/common_timer.h
|
|
@@ -2,6 +2,7 @@
|
|
#define LIBRDTSC_COMMON_TIMER_H
|
|
|
|
#include <librdtsc/common.h>
|
|
+#include <librdtsc/cycles.h>
|
|
|
|
extern uint64_t rdtsc_get_tsc_freq_arch();
|
|
extern uint64_t rdtsc_get_tsc_freq();
|