Commit 98d9349c authored by Pavel Burovskiy's avatar Pavel Burovskiy
Browse files

Removing precompiled headers option from ccmake menu

git-svn-id: https://gforge.sci.utah.edu/svn/nektar/trunk@4076 305cdda6-5ce1-45b3-a98d-dfc68c8b3305
parent 7d9cf364
......@@ -72,9 +72,9 @@ MARK_AS_ADVANCED(NEKTAR_USE_DIRECT_BLAS_CALLS)
SET(NEKTAR_FULL_DEBUG OFF CACHE BOOL
"Enable Full Debugging.")
MARK_AS_ADVANCED(NEKTAR_FULL_DEBUG)
SET(NEKTAR_USE_PRECOMPILED_HEADERS OFF CACHE BOOL
"Enable the use of precompiled headers.")
MARK_AS_ADVANCED(NEKTAR_USE_PRECOMPILED_HEADERS)
#SET(NEKTAR_USE_PRECOMPILED_HEADERS OFF CACHE BOOL
# "Enable the use of precompiled headers.")
#MARK_AS_ADVANCED(NEKTAR_USE_PRECOMPILED_HEADERS)
IF (${CMAKE_COMPILER_IS_GNUCXX})
SET(NEKTAR_ENABLE_PROFILE OFF CACHE BOOL
......@@ -226,11 +226,11 @@ ENDIF( )
# Set up include directories
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${Boost_INCLUDE_DIRS} ${LOKI_INCLUDE_DIR} ${TINYXML_BASE})
IF( NEKTAR_USE_PRECOMPILED_HEADERS )
ADD_DEFINITIONS(-DNEKTAR_USE_PRECOMPILED_HEADERS)
ELSE( NEKTAR_USE_PRECOMPILED_HEADERS )
REMOVE_DEFINITIONS(-DNEKTAR_USE_PRECOMPILED_HEADERS)
ENDIF( NEKTAR_USE_PRECOMPILED_HEADERS )
#IF( NEKTAR_USE_PRECOMPILED_HEADERS )
# ADD_DEFINITIONS(-DNEKTAR_USE_PRECOMPILED_HEADERS)
#ELSE( NEKTAR_USE_PRECOMPILED_HEADERS )
# REMOVE_DEFINITIONS(-DNEKTAR_USE_PRECOMPILED_HEADERS)
#ENDIF( NEKTAR_USE_PRECOMPILED_HEADERS )
# Build active components
IF (NEKTAR_BUILD_LIBRARY)
......
......@@ -201,10 +201,6 @@ SET(LinearAlgebraSources
# ./LinearAlgebra/lapack.cpp
)
SET(PrecompiledHeaders
#LibUtilities.h
)
SET(KernelHeaders
./Kernel/kernel.h
)
......@@ -259,8 +255,6 @@ SOURCE_GROUP("Interpreter Sources" FILES ${InterpreterSources})
SOURCE_GROUP("Communication Headers" FILES ${CommunicationHeaders})
SOURCE_GROUP("Communication Sources" FILES ${CommunicationSources})
SOURCE_GROUP("Precompiled Headers" FILES ${PrecompiledHeaders})
SOURCE_GROUP("Kernel Headers" FILES ${KernelHeaders})
SOURCE_GROUP("Kernel Sources" FILES ${KernelSources})
......@@ -282,7 +276,6 @@ SET(LibUtilityHeaders
${LinearAlgebraHeaders}
${BasicConstHeaders}
${InterpreterHeaders}
${PrecompiledHeaders}
${KernelHeaders}
${TimeIntegrationHeaders}
${FFTHeaders}
......@@ -312,8 +305,6 @@ TARGET_LINK_LIBRARIES(LibUtilities
${TINYXML_LIB}
)
SET_LAPACK_LINK_LIBRARIES(LibUtilities)
SET(PrecompiledHeaderName )
SETUP_PRECOMPILED_HEADERS(LibUtilitySources PrecompiledHeaderName)
# This doesn't preserve the BasicUtils, Memory, etc. Find a way to fix this.
INSTALL(FILES ${BasicConstHeaders} DESTINATION ${NEKTAR_INCLUDE_DIR}/LibUtilities/BasicConst COMPONENT dev)
......
......@@ -41,8 +41,6 @@ TriExp.h
)
SET(PrecompiledHeaderName ) #LocalRegions/LocalRegions.h)
ADD_DEFINITIONS(-DLOCAL_REGIONS_EXPORTS)
ADD_NEKTAR_LIBRARY(LocalRegions lib ${NEKTAR_LIBRARY_TYPE} ${LOCAL_REGIONS_SOURCES} ${LOCAL_REGIONS_HEADERS})
......@@ -56,6 +54,4 @@ TARGET_LINK_LIBRARIES(LocalRegions
)
SET_LAPACK_LINK_LIBRARIES(LocalRegions)
SETUP_PRECOMPILED_HEADERS(LOCAL_REGIONS_SOURCES PrecompiledHeaderName)
INSTALL(FILES ${LOCAL_REGIONS_HEADERS} DESTINATION ${NEKTAR_INCLUDE_DIR}/LocalRegions COMPONENT dev)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment