[waffle] [PATCH 1/3] cmake: Add to CMAKE_MODULE_PATH before project() to allow Platform cmake modules

Chad Versace chad.versace at linux.intel.com
Tue Nov 27 10:57:54 PST 2012


Josh,

I've committed patches 1 and 2 to master. Comments on patch 3.

On 11/27/2012 10:43 AM, Josh Triplett wrote:
> The project() command normally includes the platform-specific module
> Platform/${CMAKE_SYSTEM_NAME}.cmake.  To support loading that module
> from the project's cmake module directory rather than just the system
> cmake module directory, extend CMAKE_MODULE_PATH before calling
> project().
> 
> Signed-off-by: Josh Triplett <josh at joshtriplett.org>
> ---
>  CMakeLists.txt |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index 970faf8..5774b37 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -23,6 +23,7 @@
>  # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
>  
> +list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")
>  project(waffle C)
>  cmake_minimum_required(VERSION 2.8)
>  
> @@ -57,7 +58,6 @@ set(waffle_soversion "0")
>  # Includes
>  # ------------------------------------------------------------------------------
>  
> -list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")
>  include(CheckThreadLocalStorage)
>  
>  #
> 



More information about the waffle mailing list