Changeset 1ecd26f in nscp for libs

Timestamp:

01/03/11 08:21:00 (2 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

e6792f3

Parents:

f7663c9

Message:

syncronized streams between 0.4.x and 0.3.x as well as improed the CMAke build *alot*

Location:

libs

Files:

• cryptopp/CMakeLists.txt (modified) (3 diffs)
• protobuf/CMakeLists.txt (modified) (2 diffs)

libs/cryptopp/CMakeLists.txt

@@ -42 +42 @@
 
   ADD_LIBRARY (cryptopp SHARED ${cryptopp_SOURCES})
+  SET_TARGET_PROPERTIES(cryptopp PROPERTIES FOLDER "libraries")
   #IF(NOT WIN32)
-    ADD_LIBRARY (cryptopp_static STATIC  ${cryptopp_SOURCES})
+  ADD_LIBRARY(cryptopp_static STATIC  ${cryptopp_SOURCES})
+  SET_TARGET_PROPERTIES(cryptopp_static PROPERTIES FOLDER "libraries")
+
   # SET_TARGET_PROPERTIES(cryptopp_static PROPERTIES OUTPUT_NAME cryptopp)
   #ENDIF(NOT WIN32)
@@ -53 +56 @@
   ENDIF (WIN32)
 
-  IF (WIN32)
-    INSTALL (TARGETS cryptopp 
-      RUNTIME DESTINATION bin
-      LIBRARY DESTINATION bin
-      ARCHIVE DESTINATION bin
-      )
-  ELSE (WIN32)
-    INSTALL (TARGETS cryptopp cryptopp_static
-      RUNTIME DESTINATION bin
-      LIBRARY DESTINATION bin
-      ARCHIVE DESTINATION bin
-    )
-  ENDIF (WIN32)
+  #IF (WIN32)
+    #INSTALL (TARGETS cryptopp 
+    # RUNTIME DESTINATION bin
+    # LIBRARY DESTINATION bin
+    # ARCHIVE DESTINATION bin
+    # )
+  #ELSE (WIN32)
+    #INSTALL  (TARGETS cryptopp cryptopp_static
+    # RUNTIME DESTINATION bin
+    # LIBRARY DESTINATION bin
+    # ARCHIVE DESTINATION bin
+    #)
+  #ENDIF (WIN32)
 
   IF(APPLE)
@@ -76 +79 @@
     IF(NOT MSVC)
     SET_TARGET_PROPERTIES(cryptopp PROPERTIES COMPILE_FLAGS "-mthreads -w -finline-functions -O3 -DNDEBUG -D__MINGW__ -DWIN32 -D_WIN32_WINNT=0x0501 -D_WIN32")
-      SET_TARGET_PROPERTIES(cryptopp_static PROPERTIES COMPILE_FLAGS "-mthreads -w -finline-functions -O3 -DNDEBUG -D__MINGW__ -DWIN32 -D_WIN32_WINNT=0x0501 -D_WIN32")
+    SET_TARGET_PROPERTIES(cryptopp_static PROPERTIES COMPILE_FLAGS "-mthreads -w -finline-functions -O3 -DNDEBUG -D__MINGW__ -DWIN32 -D_WIN32_WINNT=0x0501 -D_WIN32")
     ENDIF(NOT MSVC)
   ENDIF(APPLE)

libs/protobuf/CMakeLists.txt

@@ -1 +1 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
-WRAP_PROTO(PB_PLUGIN plugin.proto)
+WRAP_PROTO(PROTO_PLUGIN_SRC plugin.proto)
+WRAP_PROTO(PROTO_LOG_SRC log.proto)
 
 SET(TARGET protobuf)
@@ -8 +9 @@
 
 SET(SRCS
-  ${PB_PLUGIN}
+  ${PROTO_PLUGIN_SRC}
+  ${PROTO_LOG_SRC}
 )
 
 add_library(${TARGET} ${SRCS})
+SET_TARGET_PROPERTIES(${TARGET} PROPERTIES FOLDER "libraries")
 
 target_link_libraries(${TARGET}