Просмотр исходного кода

Adds cached shared_lib var, prefixes it with OPENER_

All OPENER specific vars are prefixed with OPENER_, in order to avoid
name clashes with standard CMake vars or vars from other projects.

Signed-off-by: Martin Melik-Merkumians <melik-merkumians@acin.tuwien.ac.at>
Martin Melik-Merkumians 6 лет назад
Родитель
Сommit
2b91786a92

+ 5 - 0
source/CMakeLists.txt

@@ -75,6 +75,11 @@ if(OpENer_TRACES)
   createTraceLevelOptions()
 endif(OpENer_TRACES)
 
+#######################################
+# OpENer library mode switch          #
+#######################################
+set( OPENER_BUILD_SHARED_LIBS OFF CACHE BOOL "Builds OpENer as separate lib and sample application" )
+
 #######################################
 # Test switch                         #
 #######################################

+ 0 - 1
source/buildsupport/Toolchain/Toolchain-EABI-ARM-Generic.cmake

@@ -68,4 +68,3 @@ string(REGEX REPLACE ";" " " CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}" CACHE STRING "")
 
-set(BUILD_SHARED_LIBS OFF)

+ 2 - 2
source/src/CMakeLists.txt

@@ -18,9 +18,9 @@ opener_common_includes()
 
 opener_platform_support( "INCLUDES" )
 
-if( BUILD_SHARED_LIBS )
+if( OPENER_BUILD_SHARED_LIBS )
   install(DIRECTORY .
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     FILES_MATCHING PATTERN "*.h"
    )
-endif( BUILD_SHARED_LIBS )
+endif()

+ 2 - 2
source/src/cip/CMakeLists.txt

@@ -16,7 +16,7 @@ set( CIP_SRC appcontype.c cipassembly.c cipclass3connection.c cipcommon.c cipcon
 
 add_library( CIP ${CIP_SRC} )
 
-if( BUILD_SHARED_LIBS )
+if( OPENER_BUILD_SHARED_LIBS )
   target_link_libraries(CIP ENET_ENCAP)
   install(TARGETS CIP
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -27,4 +27,4 @@ if( BUILD_SHARED_LIBS )
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     FILES_MATCHING PATTERN "*.h"
    )
-endif( BUILD_SHARED_LIBS )
+endif()

+ 2 - 2
source/src/enet_encap/CMakeLists.txt

@@ -16,7 +16,7 @@ opener_platform_support("INCLUDES")
 
 add_library( ENET_ENCAP ${ENET_ENCAP_SRC} )
 
-if( BUILD_SHARED_LIBS )
+if( OPENER_BUILD_SHARED_LIBS )
   install(TARGETS ENET_ENCAP
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -26,6 +26,6 @@ if( BUILD_SHARED_LIBS )
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     FILES_MATCHING PATTERN "*.h"
    )
-endif( BUILD_SHARED_LIBS )
+endif()
 
 target_link_libraries( ENET_ENCAP Utils)

+ 2 - 2
source/src/ports/CMakeLists.txt

@@ -18,7 +18,7 @@ set( PLATFORM_GENERIC_SRC generic_networkhandler.c socket_timer.c  udp_protocol.
 
 add_library( PLATFORM_GENERIC ${PLATFORM_GENERIC_SRC})
 
-if( BUILD_SHARED_LIBS )
+if( OPENER_BUILD_SHARED_LIBS )
   install(TARGETS PLATFORM_GENERIC
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -31,5 +31,5 @@ if( BUILD_SHARED_LIBS )
       PATTERN "*.h"
       PATTERN "sample_application" EXCLUDE
    )
-endif( BUILD_SHARED_LIBS )
+endif()
 

+ 2 - 2
source/src/ports/POSIX/CMakeLists.txt

@@ -25,7 +25,7 @@ opener_platform_support("INCLUDES")
 add_library( ${OpENer_PLATFORM}PLATFORM ${PLATFORM_SPEC_SRC})
 # Mark executables and/or libraries for installation
 
-if( BUILD_SHARED_LIBS )
+if( OPENER_BUILD_SHARED_LIBS )
   install(TARGETS ${OpENer_PLATFORM}PLATFORM
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -38,7 +38,7 @@ if( BUILD_SHARED_LIBS )
       PATTERN "*.h"
       PATTERN "sample_application" EXCLUDE
    )
-endif( BUILD_SHARED_LIBS )
+endif()
 
 add_executable(OpENer main.c)
 

+ 1 - 1
source/src/trace.h

@@ -12,7 +12,7 @@
 
 #ifdef OPENER_WITH_TRACES
 
-#ifndef BUILD_SHARED_LIBS
+#ifndef OPENER_BUILD_SHARED_LIBS
 #include "opener_user_conf.h"
 #endif
 

+ 2 - 2
source/src/utils/CMakeLists.txt

@@ -6,7 +6,7 @@ set( UTILS_SRC random.c xorshiftrandom.c doublylinkedlist.c  enipmessage.c)
 
 add_library( Utils ${UTILS_SRC} )
 
-if( BUILD_SHARED_LIBS )
+if( OPENER_BUILD_SHARED_LIBS )
   install(TARGETS Utils
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -16,5 +16,5 @@ if( BUILD_SHARED_LIBS )
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
     FILES_MATCHING PATTERN "*.h"
    )
-endif( BUILD_SHARED_LIBS )
+endif()