Skip to content

Commit

Permalink
forgot to remove commented out mods
Browse files Browse the repository at this point in the history
  • Loading branch information
samhunter committed Mar 11, 2020
1 parent 1fc60f3 commit 30afc73
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 6 deletions.
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ option(BUILD_GPERFTOOLS "links to google perftools" OFF)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
message( status "cmake module path: " ${CMAKE_MODULE_PATH})

#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ")
set(CMAKE_CXX_STANDARD 11)

set(Boost_USE_STATIC_LIBS OFF)
Expand All @@ -19,7 +18,6 @@ elseif (UNIX)
set(EXTRA_BUILD_FLAGS ${EXTRA_BUILD_FLAGS} "-static -pthread -Wl,--whole-archive -lpthread -Wl,--no-whole-archive")
set(Boost_USE_STATIC_LIBS ON)
set(BUILD_SHARED_LIBS OFF)
#set(CMAKE_CXX_STANDARD 11)
endif()
endif()

Expand Down
4 changes: 0 additions & 4 deletions cmake/gtest.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ message(STATUS "tar result: ${tar_result} ${CMAKE_SOURCE_DIR}/ext/googletest/rel
ExternalProject_Add(googletest
SOURCE_DIR "${CMAKE_SOURCE_DIR}/ext/googletest/googletest-release-1.10.0"
CMAKE_ARGS -Dgtest_force_shared_crt=ON
#-DCMAKE_CXX_FLAGS=${MSVC_COMPILER_DEFS}
#-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=ReleaseLibs
#-DBUILD_GTEST=ON
#-DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG:PATH=DebugLibs
PREFIX "${CMAKE_CURRENT_BINARY_DIR}"

# Disable install step
Expand Down

0 comments on commit 30afc73

Please sign in to comment.