Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions iotdb-client/client-cpp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@
</goals>
<phase>integration-test</phase>
<configuration>
<config>${cmake.build.type}</config>
<projectDirectory>${project.build.directory}/build/test</projectDirectory>
<skipTests>${maven.test.skip}</skipTests>
</configuration>
Expand Down Expand Up @@ -314,8 +315,8 @@
<skip>${ctest.skip.tests}</skip>
<name>iotdb-server</name>
<waitForInterrupt>false</waitForInterrupt>
<!-- Maximum time in seconds to wait after launching IoTDB -->
<waitAfterLaunch>15</waitAfterLaunch>
<!-- Maximum time in seconds to wait after launching IoTDB (JVM cold start on Windows can exceed 15s) -->
<waitAfterLaunch>45</waitAfterLaunch>
<!-- Redirect IoTDB server log to /dev/null -->
<processLogFile>${project.build.directory}/build/test/test.log</processLogFile>
<arguments>
Expand Down
5 changes: 4 additions & 1 deletion iotdb-client/client-cpp/src/main/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ PROJECT(iotdb_session CXX)
SET(CMAKE_CXX_STANDARD 11)
SET(CMAKE_CXX_STANDARD_REQUIRED ON)
SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -g -O2 ")
IF(NOT MSVC)
# Keep GCC/Clang style flags off on MSVC to avoid invalid-option build errors.
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g -O2")
ENDIF()

# Add Thrift include directory
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/../../thrift/include)
Expand Down
Loading
Loading