From d201b08d791d82a63e604ae80e9e8ccf791de67d Mon Sep 17 00:00:00 2001
From: isucan <isucan@253336fb-580f-4252-a368-f3cef5a2a82b>
Date: Mon, 3 Sep 2012 08:43:21 +0000
Subject: [PATCH] minor build system fixes
git-svn-id: https://kforge.ros.org/fcl/fcl_ros@181 253336fb-580f-4252-a368-f3cef5a2a82b
---
trunk/fcl/CMakeLists.txt | 14 ++++++--------
trunk/fcl/Makefile | 4 +++-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/trunk/fcl/CMakeLists.txt b/trunk/fcl/CMakeLists.txt
index e3ecd617..d6a89e9f 100644
--- a/trunk/fcl/CMakeLists.txt
+++ b/trunk/fcl/CMakeLists.txt
@@ -1,13 +1,6 @@
cmake_minimum_required(VERSION 2.8)
project(fcl CXX C)
-# Set the build type. Options are:
-# Coverage : w/ debug symbols, w/o optimization, w/ code-coverage
-# Debug : w/ debug symbols, w/o optimization
-# Release : w/o debug symbols, w/ optimization
-# RelWithDebInfo : w/ debug symbols, w/ optimization
-# MinSizeRel : w/o debug symbols, w/ optimization, stripped binaries
-
set(CMAKE_BUILD_TYPE Release)
set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
@@ -85,5 +78,10 @@ add_subdirectory(src)
set(pkg_conf_file "${CMAKE_CURRENT_SOURCE_DIR}/fcl.pc")
configure_file("${pkg_conf_file}.in" "${pkg_conf_file}" @ONLY)
-install(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h")
+install(DIRECTORY include/ DESTINATION include
+ FILES_MATCHING PATTERN "*.h"
+ PATTERN ".DS_Store" EXCLUDE
+ PATTERN ".svn" EXCLUDE
+)
+
install(FILES "${pkg_conf_file}" DESTINATION lib/pkgconfig/ COMPONENT pkgconfig)
diff --git a/trunk/fcl/Makefile b/trunk/fcl/Makefile
index b75b928f..5efe4407 100644
--- a/trunk/fcl/Makefile
+++ b/trunk/fcl/Makefile
@@ -1 +1,3 @@
-include $(shell rospack find mk)/cmake.mk
\ No newline at end of file
+all:
+ mkdir -p build
+ cd build && cmake .. && make
--
GitLab