Skip to content

Commit

Permalink
Merging recent changes in cmake from master (tests).
Browse files Browse the repository at this point in the history
  • Loading branch information
jcotela committed Sep 28, 2017
2 parents e8e8985 + 2e81c72 commit 89b2072
Show file tree
Hide file tree
Showing 1,097 changed files with 601,724 additions and 79,450 deletions.
21 changes: 14 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
cmake_minimum_required (VERSION 2.8.6)
cmake_policy(SET CMP0054 OLD)

project (KratosMultiphysics)

# Set here the version number **** only update upon tagging a release!
Expand Down Expand Up @@ -56,6 +58,7 @@ if(${CMAKE_COMPILER_IS_GNUCXX})
message("CMAKE_CXX_FLAGS = ${CMAKE_CXX_FLAGS}")
message("CMAKE_C_FLAGS = ${CMAKE_C_FLAGS}")
endif(${CMAKE_COMPILER_IS_GNUCXX})

if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
if(${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -funroll-loops -Wall -Wno-unused-local-typedef -Wno-unknown-pragmas ")
Expand Down Expand Up @@ -123,8 +126,17 @@ if(${MSVC14})
# Nothing needed right now
endif(${MSVC14})

# Tell the linker to give an error if undefined functions are found
# set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined")
# If no test policy enable by default
if(NOT DEFINED KRATOS_BUILD_TESTING)
message("KRATOS_BUILD_TESTING not defined. Setting to ON")
SET (KRATOS_BUILD_TESTING ON)
endif(NOT DEFINED KRATOS_BUILD_TESTING)

# If install prefix is set, install all the files.
if(DEFINED KRATOS_INSTALL_PREFIX)
SET(INSTALL_TESTING_FILES ON)
SET(INSTALL_PYTHON_FILES ON)
endif(DEFINED KRATOS_INSTALL_PREFIX)

# Set kratos specific module path
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_modules")
Expand All @@ -133,11 +145,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_modules")
######################################################################################
######################################################################################

# if(DEFINED KRATOS_EXTRA_LINK_LIBRARIES)
# link_directories(${KRATOS_EXTRA_LINK_PATH})
# find_library(EXTRA_LINK_LIBS ${KRATOS_EXTRA_LINK_LIBRARIES} PATH ${KRATOS_EXTRA_LINK_PATH} )
# endif(DEFINED KRATOS_EXTRA_LINK_LIBRARIES)

## Find all dependencies

##*****************************
Expand Down
Loading

0 comments on commit 89b2072

Please sign in to comment.