CMake minor fixing

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59669a02e7314bc6817130197560d2b33bceb42c..3ecebdbe5bb8f5433d24d4ee302dbfb47b599c85 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,6 +122,7 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
 
 message("Build type -- ${CMAKE_BUILD_TYPE}")
 message("Compiler version: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
+message("System: ${CMAKE_SYSTEM_NAME} version: ${CMAKE_SYSTEM_VERSION}")
 message("Target architecture: ${CMAKE_TARGET_ARCHITECTURE}")
 if(CMAKE_BUILD_TYPE STREQUAL "DEBUG")
     message("Compiler flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")
@@ -134,6 +135,9 @@ else()
     message("Boost: Using CMake-fied boost")
 endif()
 
+if(CMAKE_SYSTEM_NAME STREQUAL "AIX")
+    set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> -q -c ${CMAKE_STATIC_LINKER_FLAGS} -o <TARGET> <OBJECTS>")
+endif()
 
 include_directories(${PROJECT_SOURCE_DIR})
 

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 6922caeeffce33d7851290dd3a6994f2a12f7b7d..3c13836921eb992c2d6a2cb1b609141465c428eb 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -2,7 +2,7 @@
 if (NOT GTEST_INCLUDE_DIRS)
    find_package(GTest REQUIRED)
 endif()
-message("GTest: ${GTEST_INCLUDE_DIRS}, lib: ${GTEST_LIBRARY}")
+message("GTest: ${GTEST_INCLUDE_DIRS}, lib: ${GTEST_LIBRARIES}")
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -11,7 +11,7 @@ include_directories(
 
 set(CDS_TEST_LIBRARIES
     ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
+    ${GTEST_LIBRARIES}
     ${Boost_THREAD_LIBRARY}
     ${Boost_SYSTEM_LIBRARY}
     ${CMAKE_THREAD_LIBS_INIT}