|
| 1 | +diff --git CMakeLists.txt CMakeLists.txt |
| 2 | +index cb6abda..3eea032 100644 |
| 3 | +--- CMakeLists.txt |
| 4 | ++++ CMakeLists.txt |
| 5 | +@@ -119,7 +119,6 @@ message(STATUS "Building ${CMAKE_BUILD_TYPE}") |
| 6 | + |
| 7 | + ## C++ version and flags |
| 8 | + # C++14 is needed for gtest, otherwise, C++11 is sufficient for the library |
| 9 | +-set(CMAKE_CXX_STANDARD 14) |
| 10 | + if (MSVC) |
| 11 | + add_compile_definitions(_CRT_SECURE_NO_WARNINGS) |
| 12 | + endif() |
| 13 | +diff --git src/apps/ojph_stream_expand/CMakeLists.txt src/apps/ojph_stream_expand/CMakeLists.txt |
| 14 | +index 61e8603..65be4a3 100644 |
| 15 | +--- src/apps/ojph_stream_expand/CMakeLists.txt |
| 16 | ++++ src/apps/ojph_stream_expand/CMakeLists.txt |
| 17 | +@@ -1,7 +1,6 @@ |
| 18 | + ## building ojph_stream_expand |
| 19 | + ############################## |
| 20 | + |
| 21 | +-set(CMAKE_CXX_STANDARD 14) |
| 22 | + |
| 23 | + file(GLOB OJPH_STREAM_EXPAND "*.cpp" "*.h") |
| 24 | + file(GLOB OJPH_SOCKETS "../others/ojph_sockets.cpp") |
| 25 | +diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt |
| 26 | +index ea19aea..132a619 100644 |
| 27 | +--- src/core/CMakeLists.txt |
| 28 | ++++ src/core/CMakeLists.txt |
| 29 | +@@ -135,7 +135,7 @@ if (BUILD_SHARED_LIBS AND WIN32) |
| 30 | + endif() |
| 31 | + |
| 32 | + ## include library version/name |
| 33 | +-set_target_properties(openjph PROPERTIES POSITION_INDEPENDENT_CODE ON) |
| 34 | ++#set_target_properties(openjph PROPERTIES POSITION_INDEPENDENT_CODE ON) |
| 35 | + target_compile_definitions(openjph PUBLIC _FILE_OFFSET_BITS=64) |
| 36 | + target_include_directories(openjph PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/common> $<INSTALL_INTERFACE:include>) |
| 37 | + |
0 commit comments