Changeset 101 in pacpusframework

Timestamp:

Jun 3, 2013, 3:02:22 PM (11 years ago)

Author:

DHERBOMEZ Gérald

Message:

Modifications of the build system.
Improvement of the FindPacpus.cmake package.

Location:

trunk

Files:

• cmake/FindPacpus.cmake (modified) (2 diffs)
• src/PacpusLib/CMakeLists.txt (modified) (1 diff)
• src/PacpusTools/CMakeLists.txt (modified) (1 diff)

trunk/cmake/FindPacpus.cmake

@@ -14 +14 @@
     if(NOT ENV{PACPUS_ROOT} STREQUAL "")
         set(PACPUS_ROOT $ENV{PACPUS_ROOT})
+                string (REPLACE "\\" "/" PACPUS_ROOT ${PACPUS_ROOT})
         message(STATUS "Detected PACPUS_ROOT in environment, set to '${PACPUS_ROOT}'")
     else()
@@ -24 +25 @@
     endif()
 else()
-        message(STATUS "Detected PACPUS_ROOT as argument with the path: '${PACPUS_ROOT}'")
+        string (REPLACE "\\" "/" PACPUS_ROOT ${PACPUS_ROOT})
+        message(STATUS "Detected PACPUS_ROOT as argument with the path: '${PACPUS_ROOT}'")
 endif()
 

trunk/src/PacpusLib/CMakeLists.txt

@@ -75 +75 @@
     ${QT_LIBRARIES}
     ${PACPUS_DEPENDENCIES_LIB}
-    
 )
 

trunk/src/PacpusTools/CMakeLists.txt

@@ -91 +91 @@
 # Build a library
 # ========================================
-pacpus_add_library(
-    ${PROJECT_NAME}
+pacpus_add_library( 
+    ${PROJECT_NAME} SHARED
     ${PROJECT_SRCS}
     ${PROJECT_MOC_SRCS}
 )
+
+# ========================================
+# Libraries
+# ========================================
+target_link_libraries(
+    ${PROJECT_NAME}
+    ${QT_LIBRARIES}
+    ${PACPUS_DEPENDENCIES_LIB}
+        PacpusLib
+)
+
 
 # ========================================