cmake changes from @germasch

Co-authored-by: Kai Germaschewski <kai.germaschewski@gmail.com>
jrhemstad · Aug 14, 2020 · 52e43a3 · 52e43a3
1 parent e610b88
commit 52e43a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -44,16 +44,6 @@ set(CMAKE_CXX_COMPILER $ENV{CXX})
 
 if(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
-
-    option(CMAKE_CXX11_ABI "Enable the GLIBCXX11 ABI" ON)
-    if(CMAKE_CXX11_ABI)
-        message(STATUS "NVTX3: Enabling the GLIBCXX11 ABI")
-    else()
-        message(STATUS "NVTX3: Disabling the GLIBCXX11 ABI")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
-        set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Xcompiler -D_GLIBCXX_USE_CXX11_ABI=0")
-    endif(CMAKE_CXX11_ABI)
 endif(CMAKE_COMPILER_IS_GNUCXX)
 
 # Build options
@@ -63,7 +53,7 @@ option(BUILD_BENCHMARKS "Configure CMake to build (google) benchmarks" ON)
 ###################################################################################################
 # - cmake modules ---------------------------------------------------------------------------------
 
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/" ${CMAKE_MODULE_PATH})
+list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
 
 include(FeatureSummary)
 include(CheckIncludeFiles)

diff --git a/cpp/benchmarks/CMakeLists.txt b/cpp/benchmarks/CMakeLists.txt
@@ -5,8 +5,6 @@ project(NVTX_BENCHS LANGUAGES C CXX CUDA)
 ###################################################################################################
 # - compiler options ------------------------------------------------------------------------------
 set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_C_COMPILER $ENV{tCC})
-set(CMAKE_CXX_COMPILER $ENV{CXX})
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_CUDA_STANDARD 14)
@@ -60,4 +58,4 @@ set(NVTX_BENCH_SRC
 ConfigureBench(NVTX_BENCH "${NVTX_BENCH_SRC}")
 
 
-###################################################################################################
+###################################################################################################