Changeset 123 in pacpusframework for branches

Timestamp:

Jul 24, 2013, 10:38:37 AM (11 years ago)

Author:

morasjul

Message:

fix CMakeLists for windows

Location:

branches/2.0-beta1

Files:

• CMakeLists.txt (modified) (1 diff)
• src/DBITEPlayer/CMakeLists.txt (modified) (1 diff)
• src/PacpusLib/CMakeLists.txt (modified) (2 diffs)
• src/PacpusSensor/CMakeLists.txt (modified) (2 diffs)
• src/PacpusTools/CMakeLists.txt (modified) (2 diffs)

branches/2.0-beta1/CMakeLists.txt

@@ -10 +10 @@
 project(Pacpus)
 cmake_minimum_required(VERSION 2.8)
-
+ cmake_policy(SET CMP0020  NEW) # for QT5.1 on windows
 # ========================================
 # Pacpus version

branches/2.0-beta1/src/DBITEPlayer/CMakeLists.txt

@@ -31 +31 @@
     ${PROJECT_BINARY_DIR}/../FileLib
     ${PROJECT_BINARY_DIR}/../DBITEPlayerLib
+        ${PROJECT_BINARY_DIR}/../PacpusTools
+        ${PROJECT_BINARY_DIR}/../RoadTime
 )
 

branches/2.0-beta1/src/PacpusLib/CMakeLists.txt

@@ -65 +65 @@
     ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/inputOutputInterface.h
     ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/PacpusEvent.h
-    ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/pacpusStruct.h
+ #   ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/pacpusStruct.h
 
     ./ComponentBase.cpp
@@ -75 +75 @@
     ./XmlConfigFile.cpp
     ./inputOutputBase.cpp
-    ./pacpusStruct.cpp
+ #   ./pacpusStruct.cpp
 )
 

branches/2.0-beta1/src/PacpusSensor/CMakeLists.txt

@@ -29 +29 @@
     ${PROJECT_BINARY_DIR}/../PacpusLib
     ${PROJECT_BINARY_DIR}/../FileLib
-    ${PROJECT_BINARY_DIR}/../PacpusTools
+        ${PROJECT_BINARY_DIR}/../RoadTime
 )
 
@@ -73 +73 @@
         optimized FileLib debug FileLib_d
         optimized PacpusLib debug PacpusLib_d
-        optimized PacpusTools debug PacpusTools_d
 )
 

branches/2.0-beta1/src/PacpusTools/CMakeLists.txt

@@ -27 +27 @@
 link_directories(
     ${PROJECT_BINARY_DIR}/../PacpusLib
+        ${PROJECT_BINARY_DIR}/../RoadTime
 )
 
@@ -98 +99 @@
 # Libraries
 # ========================================
+
+set(OPT_LIBRARIES
+        optimized PacpusLib debug PacpusLib_d
+)
+
+# Windows platform
+if(WIN32)
+    LIST(APPEND OPT_LIBRARIES
+        optimized ROAD_TIME debug ROAD_TIME_d
+)
+endif()
+
 target_link_libraries(
     ${PROJECT_NAME}
     ${QT_LIBRARIES}
     ${PACPUS_DEPENDENCIES_LIB}
-    optimized PacpusLib debug PacpusLib_d
+    ${OPT_LIBRARIES}
 )