Skip to content
Snippets Groups Projects
Commit 0c54c0cf authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Fixed errors in linux compilation documentation.

Added install target to utilities CMakeLists.txt.


git-svn-id: https://gforge.sci.utah.edu/svn/nektar/trunk@2533 305cdda6-5ce1-45b3-a98d-dfc68c8b3305
parent 0f4e3efe
No related branches found
No related tags found
No related merge requests found
......@@ -177,7 +177,7 @@ Material</a></p>
<ol>
<li>
In <em>ThirdParty/</em>, extract the cmake-2.8.0.tar.gz archive with
<div class="code"><pre>tar -xjvf cmake-2.8.0.tar.gz </pre></div>
<div class="code"><pre>tar -xzvf cmake-2.8.0.tar.gz </pre></div>
</li>
<li>
Change to the <em>cmake-2.8.0/</em> directory, and type
......@@ -487,7 +487,7 @@ compiled the Nektar++ library and Solvers </br>
<div class="code"><pre>ccmake ../</pre></div>
Generate the project files in the same way you generated the project files for Nektar++.
<b>Note:</b> If you are modifying the regression tests by adding or removing tests you can generate a new master ".ok" file by answering <strong>No</strong> to the <em> "Would you like to see advanced options?"</em> in step 2 and setting the variable <em>REGRESSION_MAKE_OK_FILES_EXEC</em> to <em>ON</em>. This will, for example, generate the executable <em>StdRegionsDemoMakeOKFile</em> which when executed will execute a series of demos and make the updated .ok files.
<b>Note:</b> If you are modifying the regression tests by adding or removing tests you can generate a new master ".ok" file by answering <strong>Yes</strong> to the <em> "Would you like to see advanced options?"</em> in step 2 and setting the variable <em>REGRESSION_MAKE_OK_FILES_EXEC</em> to <em>ON</em>. This will, for example, generate the executable <em>StdRegionsDemoMakeOKFile</em> which when executed will execute a series of demos and make the updated .ok files.
</ul>
</ol>
......
......@@ -108,6 +108,7 @@ Material</a></p>
<ul>
<li>Cristian Biotto (2009 - present)</li>
<li>Alessandro Bolis (2009 - present)</li>
<li>Chris Cantwell (2009 - present)</li>
<li>Susanne Claus (2009 - present)</li>
......
......@@ -7,6 +7,10 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
PROJECT(UTILITIES)
IF( NOT(CMAKE_INSTALL_PREFIX_SET) )
SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/dist CACHE FILEPATH "Install Path" FORCE)
ENDIF()
SET(CMAKE_INSTALL_PREFIX_SET ON CACHE INTERNAL "")
# Setup where CMake will look for modules. You probably
# won't need to modify this.
......@@ -28,6 +32,7 @@ IF( NEKTAR++_FOUND )
INCLUDE_DIRECTORIES(${UTILITIES_SOURCE_DIR})
ENDIF( NEKTAR++_FOUND )
MACRO(ADD_UTILITIES_EXECUTABLE name source)
ADD_EXECUTABLE(${name} ${source} ${ARGN})
......@@ -46,15 +51,18 @@ MACRO(ADD_UTILITIES_EXECUTABLE name source)
SET_LAPACK_LINK_LIBRARIES(${name})
ENDIF( NEKTAR++_FOUND )
INSTALL(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
ENDMACRO(ADD_UTILITIES_EXECUTABLE name source)
MACRO(SET_COMMON_PROPERTIES name)
SET_TARGET_PROPERTIES(${name} PROPERTIES DEBUG_POSTFIX -g)
SET_TARGET_PROPERTIES(${name} PROPERTIES MINSIZEREL_POSTFIX -ms)
SET_TARGET_PROPERTIES(${name} PROPERTIES RELWITHDEBINFO_POSTFIX -rg)
ENDMACRO(SET_COMMON_PROPERTIES name)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment