Merged in vijaysm/cmake-fixes (pull request #273)

Several critical fixes for CMake builds

config/CheckCompilerFlags.cmake

@@ -31,7 +31,10 @@ if ( CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang") )
   FORCE_ADD_FLAGS(CMAKE_C_FLAGS "${MOAB_CXX_FLAGS}")
   FORCE_ADD_FLAGS(CMAKE_Fortran_FLAGS "${MOAB_CXX_FLAGS}")
   ENABLE_IF_SUPPORTED(MOAB_CXX_FLAGS "-fpermissive")
-  ENABLE_IF_SUPPORTED(MOAB_CXX_FLAGS "-Wno-c++11-long-long")
+  ENABLE_IF_SUPPORTED(MOAB_CXX_FLAGS "-Wno-ignored-attributes")
+  ENABLE_IF_SUPPORTED(MOAB_CXX_FLAGS "-Wno-deprecated-declarations")
+  # Need to enable or check for this only if user asks for C++11 support
+  # ENABLE_IF_SUPPORTED(MOAB_CXX_FLAGS "-Wno-c++11-long-long")
   if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.8)
     ENABLE_IF_SUPPORTED(MOAB_CXX_FLAGS "-Wno-unused-local-typedefs")
   endif()

config/TestBigEndian.cmake

@@ -5,7 +5,7 @@
 #
 
 MACRO(TEST_BIG_ENDIAN VARIABLE)
-  IF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
+  IF(HAVE_${VARIABLE} MATCHES ^HAVE_${VARIABLE}$)
     MESSAGE(STATUS "Check if the system is big endian")
     MESSAGE(STATUS "Searching 16 bit integer")
   
@@ -93,6 +93,6 @@ MACRO(TEST_BIG_ENDIAN VARIABLE)
           "Determining if the system is big endian failed with the following output:\n${OUTPUT}\nTestEndianess.c:\n${TEST_ENDIANESS_FILE_CONTENT}\n\n")
         SET(${VARIABLE})
       ENDIF(HAVE_${VARIABLE})
-  ENDIF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
+  ENDIF(HAVE_${VARIABLE} MATCHES ^HAVE_${VARIABLE}$)
 ENDMACRO(TEST_BIG_ENDIAN)
 

itaps/fbigeom/CMakeLists.txt

@@ -28,7 +28,7 @@ if ( MOAB_HAVE_MPI )
                        ${CMAKE_BINARY_DIR}/src/parallel)
 endif ()
 
-target_link_libraries( FBiGeomMOAB MOAB )
+target_link_libraries( FBiGeomMOAB iMesh MOAB )
 
 set_target_properties(
   FBiGeomMOAB

test/MBTest.cpp

@@ -2358,7 +2358,7 @@ ErrorCode mb_mesh_set_flag_test()
   unsigned int flags;
   rval = mb->get_meshset_options( set, flags );
   CHKERR(rval);
-  if(!MESHSET_SET&flags || MESHSET_TRACK_OWNER&flags || MESHSET_ORDERED&flags){
+  if(!(MESHSET_SET&flags) || (MESHSET_TRACK_OWNER&flags) || (MESHSET_ORDERED&flags) ){
     std::cerr << "set should be MESHSET_SET only, flags=" << flags << std::endl;
     return MB_FAILURE;
   }

test/perf/CMakeLists.txt

 add_subdirectory(point_location)
 set( LIBS MOAB )
-set( TESTS seqperf.cpp
-           adj_mem_time_test.cpp
+set( TESTS adj_mem_time_test.cpp
            )
 
 if(MOAB_HAVE_HDF5)
   set( TESTS ${TESTS} adj_time.cpp )
 endif(MOAB_HAVE_HDF5)
 
-set( TOOLS perf.cpp
+set( TOOLS seqperf.cpp
+           perf.cpp
            perftool.cpp
            umr_perf.cpp )
 

tools/mbpart.cpp

@@ -491,7 +491,7 @@ int main(int argc, char* argv[])
       rval = mb.write_file(tmp_output_file.str().c_str());
       if (MB_SUCCESS != rval)
       {
-        std::cerr << tmp_output_file << " : failed to write file." << std::endl;
+        std::cerr << tmp_output_file.str() << " : failed to write file." << std::endl;
         std::cerr << "  Error code: " << mb.get_error_string(rval) << " ("
                   << rval << ")" << std::endl;
         std::string errstr;