using CMAKE_* build vars

source/buildsupport/POSIX/OpENer_PLATFORM_INCLUDES.cmake

@@ -1,6 +1,8 @@
 macro(opener_platform_spec)
   include_directories(${PORTS_SRC_DIR}/${OpENer_PLATFORM} ${PORTS_SRC_DIR}/${OpENer_PLATFORM}/sample_application)
   set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Werror=implicit-function-declaration" )
+  set( CMAKE_INSTALL_LIBDIR "lib")
+  set( CMAKE_INSTALL_INCLUDEDIR "include")
   add_definitions( -D_POSIX_C_SOURCE=200112L -D__USE_GNU -D__USE_XOPEN2K -DOPENER_POSIX)
   get_property(languages GLOBAL PROPERTY ENABLED_LANGUAGES)
   if ("CXX" IN_LIST languages)

source/src/CMakeLists.txt

@@ -17,3 +17,10 @@ opener_common_includes()
 #######################################
 
 opener_platform_support( "INCLUDES" )
+
+if( BUILD_SHARED_LIBS )
+  install(DIRECTORY .
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    FILES_MATCHING PATTERN "*.h"
+   )
+endif( BUILD_SHARED_LIBS )

source/src/cip/CMakeLists.txt

@@ -18,12 +18,12 @@ add_library( CIP ${CIP_SRC} )
 
 if( BUILD_SHARED_LIBS )
   install(TARGETS CIP
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib
-    RUNTIME DESTINATION lib
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
   install(DIRECTORY ${CIP_SRC_DIR}
-    DESTINATION include
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     FILES_MATCHING PATTERN "*.h"
    )
 endif( BUILD_SHARED_LIBS )

source/src/enet_encap/CMakeLists.txt

@@ -18,12 +18,12 @@ add_library( ENET_ENCAP ${ENET_ENCAP_SRC} )
 
 if( BUILD_SHARED_LIBS )
   install(TARGETS ENET_ENCAP
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib
-    RUNTIME DESTINATION lib
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
   install(DIRECTORY ${ENET_ENCAP_SRC_DIR}
-    DESTINATION include
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     FILES_MATCHING PATTERN "*.h"
    )
 endif( BUILD_SHARED_LIBS )

source/src/opener_api.h

@@ -12,7 +12,7 @@
 #include "typedefs.h"
 #include "ciptypes.h"
 #include "ciperror.h"
-#include "opener_user_conf.h"
+//#include "opener_user_conf.h"
 
 /**  @defgroup CIP_API OpENer User interface
  * @brief This is the public interface of the OpENer. It provides all function

source/src/ports/CMakeLists.txt

@@ -20,12 +20,12 @@ add_library( PLATFORM_GENERIC ${PLATFORM_GENERIC_SRC})
 
 if( BUILD_SHARED_LIBS )
   install(TARGETS PLATFORM_GENERIC
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib
-    RUNTIME DESTINATION lib
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
   install(DIRECTORY ${PORTS_SRC_DIR}
-    DESTINATION include
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     USE_SOURCE_PERMISSIONS
     FILES_MATCHING
       PATTERN "*.h"

source/src/trace.h

@@ -6,7 +6,7 @@
 #ifndef OPENER_TRACE_H_
 #define OPENER_TRACE_H_
 
-#include <opener_user_conf.h>
+//#include <opener_user_conf.h>
 
 /** @file trace.h
  * @brief Tracing infrastructure for OpENer

source/src/utils/CMakeLists.txt

@@ -8,12 +8,12 @@ add_library( Utils ${UTILS_SRC} )
 
 if( BUILD_SHARED_LIBS )
   install(TARGETS Utils
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib
-    RUNTIME DESTINATION lib
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
   )
   install(DIRECTORY ${UTILS_SRC_DIR}
-    DESTINATION include
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     FILES_MATCHING PATTERN "*.h"
    )
 endif( BUILD_SHARED_LIBS )