Merge branch 'master' of https://github.com/tysonite/asn1-compiler

tysonite · Oct 11, 2013 · c4b4023 · c4b4023
2 parents 80b90d2 + 92ff548
commit c4b4023
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/runtime/src/CMakeLists.txt b/runtime/src/CMakeLists.txt
@@ -79,19 +79,22 @@ if (CMAKE_COMPILER_IS_GNUCC)
    set_source_files_properties(${SOURCES} PROPERTIES COMPILE_FLAGS "-std=c++0x -Wall")
 endif ()
 
-set (ASN1_RUNTIME_LIBRARY
-   asn1-runtime-lib
+set (ASN1_RUNTIME_LIBRARY_STATIC
+   asn1-runtime-static
+   CACHE INTERNAL "")
+
+set (ASN1_RUNTIME_LIBRARY_SHARED
+   asn1-runtime-shared
    CACHE INTERNAL "")
 
 set (ASN1_RUNTIME_LINK_LIBRARIES
    ${ASN1_RUNTIME_LINK_LIBRARIES}
-   ${ASN1_RUNTIME_LIBRARY}
+   ${ASN1_RUNTIME_LIBRARY_STATIC}
    CACHE INTERNAL "")
 
 source_group ("Header Files" FILES ${HEADERS})
 
-add_library (${ASN1_RUNTIME_LIBRARY} ${SOURCES} ${HEADERS})
-
-target_link_libraries(${ASN1_RUNTIME_LIBRARY} ${ASN1_RUNTIME_LINK_LIBRARIES})
-
+add_library (${ASN1_RUNTIME_LIBRARY_STATIC} STATIC ${SOURCES} ${HEADERS})
+add_library (${ASN1_RUNTIME_LIBRARY_SHARED} SHARED ${SOURCES} ${HEADERS})
 
+target_link_libraries(${ASN1_RUNTIME_LIBRARY_STATIC} ${ASN1_RUNTIME_LINK_LIBRARIES})