Merge commit '2af833a02ab1ad4d1e9caf12efe7705e73fb2c32'

moose-core/CMakeLists.txt

@@ -72,7 +72,6 @@ endif()
 
 ################################ CMAKE OPTIONS ##################################
 
-option(WITH_DOC "Build documentation using python-sphinx and doxygen" OFF)
 option(VERBOSITY "Set MOOSE verbosity level (deprecated)" 0)
 ## Unit testing and debug mode.
 option(DEBUG "Build with debug support" OFF)
@@ -201,10 +200,6 @@ if(LIBSBML_FOUND)
         find_package(LibXML2 REQUIRED)
     endif()
     include_directories(${LibXML2_INCLUDE_DIRS})
-    if(${LIBSBML_LIBRARY_DIRS})
-        target_link_libraries(libmoose PROPERTIES LINK_FLAGS "-L${LIBSBML_LIBRARY_DIRS}")
-    endif()
-
 else()
     message(
         "======================================================================\n"
@@ -267,23 +262,17 @@ if(WITH_GSL)
     # top level.
     include_directories( ${GSL_INCLUDE_DIRS} )
 elseif(WITH_BOOST)
-    find_package(Boost 1.44 COMPONENTS filesystem REQUIRED)
+    find_package(Boost 1.44 COMPONENTS filesystem random REQUIRED)
     find_package( LAPACK REQUIRED )
     add_definitions( -DUSE_BOOST -UUSE_GSL )
     include_directories( ${Boost_INCLUDE_DIRS} )
-    #    check_include_file_cxx(
-    #        ${Boost_INCLUDE_DIRS}/boost/random/random_device.hpp
-    #        BOOST_RANDOM_DEVICE_EXISTS
-    #        )
-    #    if(BOOST_RANDOM_DEVICE_EXISTS)
-    #        add_definitions(-DBOOST_RANDOM_DEVICE_EXISTS)
-    #    endif(BOOST_RANDOM_DEVICE_EXISTS)
-    #    check_include_file_cxx(
-    #        ${Boost_INCLUDE_DIRS}/boost/filesystem.hpp BOOST_FILESYSTEM_EXISTS
-    #        )
-    #    if(BOOST_FILESYSTEM_EXISTS)
-    #        add_definitions( -DBOOST_FILESYSTEM_EXISTS )
-    #    endif(BOOST_FILESYSTEM_EXISTS)
+    check_include_file_cxx(
+        ${Boost_INCLUDE_DIRS}/boost/random/random_device.hpp
+        BOOST_RANDOM_DEVICE_EXISTS
+        )
+    if(BOOST_RANDOM_DEVICE_EXISTS)
+        add_definitions(-DBOOST_RANDOM_DEVICE_EXISTS)
+    endif(BOOST_RANDOM_DEVICE_EXISTS)
 endif()
 
 ## Setup hdf5
@@ -513,42 +502,14 @@ if(CMAKE_VERSION VERSION_LESS "2.8.0")
     target_link_libraries(moose.bin PUBLIC moose)
 ELSE()
     target_link_libraries(moose.bin LINK_PUBLIC moose)
-    if(LIBSBML_FOUND)
-        target_link_libraries(moose.bin LINK_PUBLIC ${LIBSBML_LIBRARIES})
-    endif(LIBSBML_FOUND)
 ENDIF()
 
-if(WITH_DOC)
-    FIND_PACKAGE(Doxygen REQUIRED)
-    add_custom_command(TARGET libmoose POST_BUILD
-        COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.full
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        COMMENT "Building developer documentation"
-        VERBATIM
-        )
-endif(WITH_DOC)
-
 ######################### BUILD PYMOOSE ########################################
 # Root of all python module.
 if(WITH_PYTHON)
     add_subdirectory( pymoose )
 endif(WITH_PYTHON)
 
-## Moose documentation
-option(WITH_DOC "Build documentation using python-sphinx and doxygen" OFF)
-if(WITH_DOC)
-    FIND_PACKAGE(Sphinx REQUIRED)
-    message(STATUS "Build documentation.")
-    set(USER_DOC_OUTPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Docs/user/py/_build/html)
-    set(DEVELOPER_DOC_OUTPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Docs/developer/html)
-    ADD_CUSTOM_TARGET(docs ALL
-        COMMAND ./docgen
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        COMMENT "Generating html doc using sphinx and doxygen"
-        )
-
-endif(WITH_DOC)
-
 ######################### INSTALL ##############################################
 
 install(TARGETS moose.bin
@@ -575,17 +536,6 @@ if(WITH_PYTHON)
 
 endif(WITH_PYTHON)
 
-if(WITH_DOC)
-    message(STATUS "Installing moose doc")
-    install(DIRECTORY ${USER_DOC_OUTPUT_DIR}
-        DESTINATION share/doc/moose
-        )
-
-    install(DIRECTORY ${DEVELOPER_DOC_OUTPUT_DIR}
-        DESTINATION share/doc/moose/developer
-        )
-endif()
-
 # Print message to start build process
 if(${CMAKE_BUILD_TOOL} MATCHES "make")
     message(

moose-core/CheckCXXCompiler.cmake

@@ -5,6 +5,8 @@ CHECK_CXX_COMPILER_FLAG( "-std=c++11" COMPILER_SUPPORTS_CXX11 )
 CHECK_CXX_COMPILER_FLAG( "-std=c++0x" COMPILER_SUPPORTS_CXX0X )
 CHECK_CXX_COMPILER_FLAG( "-Wno-strict-aliasing" COMPILER_WARNS_STRICT_ALIASING )
 
+
+
 # Turn warning to error: Not all of the options may be supported on all
 # versions of compilers. be careful here.
 add_definitions(-Wall
@@ -18,6 +20,13 @@ if(COMPILER_WARNS_STRICT_ALIASING)
     add_definitions( -Wno-strict-aliasing )
 endif(COMPILER_WARNS_STRICT_ALIASING)
 
+# Disable some harmless warnings.
+CHECK_CXX_COMPILER_FLAG( "-Wno-unused-but-set-variable"
+    COMPILER_SUPPORT_UNUSED_BUT_SET_VARIABLE_NO_WARN
+    )
+if(COMPILER_SUPPORT_UNUSED_BUT_SET_VARIABLE_NO_WARN)
+    add_definitions( "-Wno-unused-but-set-variable" )
+endif(COMPILER_SUPPORT_UNUSED_BUT_SET_VARIABLE_NO_WARN)
 
 if(COMPILER_SUPPORTS_CXX11)
     message(STATUS "Your compiler supports c++11 features. Enabling it")