Added -mcx16 compiler option

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d9d61b11984b173f3f51f53660d2f0abded0cef..2b7af68d69abc52256a623d25c57fa6e8d9a4f25 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,7 +75,7 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")  
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -mcx16")  
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -fno-strict-aliasing")
 # gcc 4.8: disable noise -Wunused-local-typedefs
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedefs -Wno-unused-parameter")  
@@ -90,6 +90,8 @@ if (CMAKE_BUILD_TYPE STREQUAL "DEBUG")
 else()
   message("Compiler flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}")
 endif()
+message("Boost: ${Boost_LIB_VERSION} in ${Boost_INCLUDE_DIRS}, lib ${Boost_LIBRARY_DIRS}")
+
 
 include_directories(${PROJECT_SOURCE_DIR})
 

diff --git a/cds/details/defs.h b/cds/details/defs.h
index 1727dfbe0602b7ed7047ad933453e6e05cb117aa..b83701bba1e43e54c772eb63972fcff339856e7f 100644 (file)
--- a/cds/details/defs.h
+++ b/cds/details/defs.h
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -25,7 +25,7 @@
     SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
     OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.     
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #ifndef CDSLIB_DEFS_H
@@ -164,9 +164,9 @@
    The <b>cds</b> is mostly header-only library. Only small part of library related to GC core functionality
    should be compiled.
 
-   The test projects depends on the following static library from \p boost:
-   - \p boost.thread
-   - \p boost.system
+   External dependenies: the tests depends on:
+   - \p boost.thread (thread-loal storage support), boost.system
+   - \p google-test
 
    \par Windows build
 

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 730a3072d1e296bbdb62093f2688b799b2438623..fce8ea13db4481e0a5ab4a744fccf67aec78719f 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 find_package(GTest REQUIRED) 
+message("GTest: ${GTEST_INCLUDE_DIRS}")
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/include