celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [1/4] celix git commit: CELIX-237: Fixed type in travis.yml and improved FindCppUTest.cmake
Date Wed, 08 Jul 2015 08:37:46 GMT
Repository: celix
Updated Branches:
  refs/heads/feature/CELIX-237_rsa-ffi face89444 -> 3a1503988


CELIX-237: Fixed type in travis.yml and improved FindCppUTest.cmake


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/1cab7846
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/1cab7846
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/1cab7846

Branch: refs/heads/feature/CELIX-237_rsa-ffi
Commit: 1cab784603548bab47b7c5a9a727e33ad2679a0b
Parents: face894
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Wed Jul 8 09:20:06 2015 +0200
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Wed Jul 8 09:20:06 2015 +0200

----------------------------------------------------------------------
 .travis.yml              |  4 ++--
 cmake/FindCppUTest.cmake | 34 +++++++++++++++++++++++++---------
 2 files changed, 27 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/1cab7846/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 2c3f23f..f4e5ff9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ before_script:
     - cd ..
     - mkdir build install
     - cd build
-    - cmake -DENABLE_CODE_COVERAG=ON -DCMAKE_SKIP_BUILD_RPATH=FALSE -DBUILD_DEPLOYMENT_ADMIN=ON
-DBUILD_EXAMPLES=ON -DBUILD_LOG_SERVICE=ON -DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON -DBUILD_RSA_DISCOVERY_SHM=ON
-DBUILD_RSA_EXAMPLES=ON -DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON -DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON
-DBUILD_REMOTE_SHELL=ON -DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DCMAKE_INSTALL_PREFIX=../install
..
+    - cmake -DENABLE_CODE_COVERAGE=ON -DCMAKE_SKIP_BUILD_RPATH=FALSE -DBUILD_DEPLOYMENT_ADMIN=ON
-DBUILD_EXAMPLES=ON -DBUILD_LOG_SERVICE=ON -DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON -DBUILD_RSA_DISCOVERY_SHM=ON
-DBUILD_RSA_EXAMPLES=ON -DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON -DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON
-DBUILD_REMOTE_SHELL=ON -DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DCMAKE_INSTALL_PREFIX=../install
..
 
 script: 
-    - make all && make deploy && make coverage
+    - make coverage

http://git-wip-us.apache.org/repos/asf/celix/blob/1cab7846/cmake/FindCppUTest.cmake
----------------------------------------------------------------------
diff --git a/cmake/FindCppUTest.cmake b/cmake/FindCppUTest.cmake
index ee8cf26..516bc52 100644
--- a/cmake/FindCppUTest.cmake
+++ b/cmake/FindCppUTest.cmake
@@ -15,11 +15,25 @@
 # specific language governing permissions and limitations
 # under the License.
 
-FIND_PATH(CPPUTEST_INCLUDE_DIR NAMES CppUTest/TestHarness.h)
-FIND_PATH(CPPUTEST_EXT_INCLUDE_DIR NAMES CppUTestExt/MockSupport.h)
+FIND_PATH(CPPUTEST_INCLUDE_DIR NAMES CppUTest/TestHarness.h
+    PATHS $ENV{CPPUTEST_DIR} ${CPPUTEST_DIR} /usr /usr/local /opt/local
+    PATH_SUFFIXES include    
+)
 
-FIND_LIBRARY(CPPUTEST_LIBRARY NAMES CppUTest)
-FIND_LIBRARY(CPPUTEST_EXT_LIBRARY NAMES CppUTestExt)
+FIND_PATH(CPPUTEST_EXT_INCLUDE_DIR NAMES CppUTestExt/MockSupport.h
+    PATHS $ENV{CPPUTEST_DIR} ${CPPUTEST_DIR} /usr /usr/local /opt/local
+    PATH_SUFFIXES include    
+)
+
+FIND_LIBRARY(CPPUTEST_LIBRARY NAMES CppUTest
+    PATHS $ENV{CPPUTEST_DIR} ${CPPUTEST_DIR} /usr /usr/local /opt/local
+    PATH_SUFFIXES lib lib64 
+)
+
+FIND_LIBRARY(CPPUTEST_EXT_LIBRARY NAMES CppUTestExt
+    PATHS $ENV{CPPUTEST_DIR} ${CPPUTEST_DIR} /usr /usr/local /opt/local
+    PATH_SUFFIXES lib lib64 
+)
 
 # handle the QUIETLY and REQUIRED arguments and set CURL_FOUND to TRUE if 
 # all listed variables are TRUE
@@ -27,12 +41,14 @@ INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(CPPUTEST DEFAULT_MSG CPPUTEST_LIBRARY CPPUTEST_INCLUDE_DIR)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(CPPUTEST_EXT DEFAULT_MSG CPPUTEST_EXT_LIBRARY CPPUTEST_EXT_INCLUDE_DIR)
 
+mark_as_advanced(CPPUTEST_INCLUDE_DIR CPPUTEST_LIBRARY CPPUTEST_EXT_LIBRARY CPPUTEST_INCLUDE_DIR)

+
 IF(CPPUTEST_FOUND)
-  SET(CPPUTEST_LIBRARY ${CPPUTEST_LIBRARY})
-  SET(CPPUTEST_INCLUDE_DIR ${CPPUTEST_INCLUDE_DIR})
+    SET(CPPUTEST_LIBRARIES ${CPPUTEST_LIBRARY})
+    SET(CPPUTEST_INCLUDE_DIRS ${CPPUTEST_INCLUDE_DIR})
 ENDIF(CPPUTEST_FOUND)
 
 IF(CPPUTEST_EXT_FOUND)
-  SET(CPPUTEST_EXT_LIBRARY ${CPPUTEST_EXT_LIBRARY})
-  SET(CPPUTEST_EXT_INCLUDE_DIR ${CPPUTEST_EXT_INCLUDE_DIR})
-ENDIF(CPPUTEST_EXT_FOUND)
\ No newline at end of file
+    SET(CPPUTEST_EXT_LIBRARIES ${CPPUTEST_EXT_LIBRARY})
+    SET(CPPUTEST_EXT_INCLUDE_DIRS ${CPPUTEST_EXT_INCLUDE_DIR})
+ENDIF(CPPUTEST_EXT_FOUND)


Mime
View raw message