From b0ce54293f888009b2f711e9404de027884edbba Mon Sep 17 00:00:00 2001 From: Gerry Stellenberg Date: Tue, 28 Dec 2010 09:47:01 -0600 Subject: [PATCH] Adjusted version to 0.9, and fixed use of LIB_TYPE so people can optionally do a shared library build with -DLIBI_TYPE=SHARED. --- CMakeLists.txt | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8967308..d68607c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,14 @@ cmake_minimum_required(VERSION 2.6) project (LIBPINPROC) +# User can redefine to "SHARED" on command line with: +# cmake -DLIB_TYPE=SHARED ... +IF(NOT DEFINED LIB_TYPE) +set(LIB_TYPE STATIC) +ENDIF(NOT DEFINED LIB_TYPE) + set(PINPROC_VERSION_MAJOR "0") -set(PINPROC_VERSION_MINOR "0") +set(PINPROC_VERSION_MINOR "9") set(PINPROC_VERSION "${YAML_CPP_VERSION_MAJOR}.${YAML_CPP_VERSION_MINOR}") IF(APPLE) @@ -11,12 +17,12 @@ IF(APPLE) ENDIF(APPLE) include_directories(${LIBPINPROC_SOURCE_DIR}/include /usr/local/include $ENV{EXTRA_INC}) - link_directories(/usr/local/lib $ENV{EXTRA_LINK}) set(FILES src/pinproc.cpp src/PRDevice.cpp src/PRHardware.cpp) -add_library(pinproc ${FILES} +add_library(pinproc ${LIB_TYPE} + ${FILES} ${public_headers} ${private_headers} ${sources} @@ -39,10 +45,13 @@ add_executable(pinprocfw utils/pinprocfw/pinprocfw.cpp utils/pinprocfw/lenval.cp target_link_libraries(pinproctest pinproc ${libraries} yaml-cpp) target_link_libraries(pinprocfw pinproc ${libraries}) +############################################################### +# The remainder of the file is used for "make install" stuff +############################################################### + set(INCLUDE_INSTALL_DIR include) set(LIB_INSTALL_DIR ${_library_dir}${LIB_SUFFIX}) -# set(_INSTALL_DESTINATIONS RUNTIME DESTINATION bin LIBRARY DESTINATION ${LIB_INSTALL_DIR} @@ -65,8 +74,3 @@ if(UNIX) install(FILES ${PC_FILE} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) endif(UNIX) - -#install(TARGETS pinproc -# ARCHIVE DESTINATION lib) -#set (HEADERS include/pinproc.h) -#install(FILES ${HEADERS} DESTINATION include)