Changeset 124 in pacpusframework for branches

Timestamp:

Jul 24, 2013, 11:31:27 AM (11 years ago)

Author:

morasjul

Message:

comment cmake policy because error linux
fix createEcporrt cmake function
unload PacpusSerialPort (move to pacpus cityvip (ToolsComponents) now

Location:

branches/2.0-beta1

Files:

• CMakeLists.txt (modified) (1 diff)
• cmake/PacpusUtilities.cmake (modified) (1 diff)
• 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
+
+#cmake_policy(SET CMP0020  NEW) # for QT5.1 on windows / not work on linux
+
 # ========================================
 # Pacpus version

branches/2.0-beta1/cmake/PacpusUtilities.cmake

@@ -392 +392 @@
         "// Export macro for use DLL for Windows only\n"
         "#ifdef WIN32\n"
-        "#   ifdef ${PLUGIN_NAME_UPPER}_EXPORT\n"
+        "   #ifdef ${PLUGIN_NAME_UPPER}_EXPORT\n"
         "//      make DLL\n"
-        "#       define ${PLUGIN_NAME_UPPER}_API __declspec(dllexport)\n"
-        "#   else\n"
+        "       #define ${PLUGIN_NAME_UPPER}_API __declspec(dllexport)\n"
+        "   #else\n"
         "//      use DLL\n"
-        "#       define ${PLUGIN_NAME_UPPER}_API __declspec(dllimport)\n"
-        "#   endif\n"
+        "       #define ${PLUGIN_NAME_UPPER}_API __declspec(dllimport)\n"
+        "   #endif\n"
         "#else\n"
         "//      On other platforms, simply ignore this\n"
-        "#       define ${PLUGIN_NAME_UPPER}_API\n"
-        "//#endif\n"
+        "   #define ${PLUGIN_NAME_UPPER}_API\n"
+        "#endif\n\n"
 
         "#endif // __EXPORT_${PLUGIN_NAME_UPPER}_H__\n"

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

@@ -41 +41 @@
     ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/geodesie.h
     #${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/pacpusStruct.h
-    ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PacpusSerialPort.h
+    #${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PacpusSerialPort.h
     ./src/matrice.cpp
     ./src/geodesie.cpp
     ./src/AsyncWorkerBase.cpp
     ./src/PeriodicWorker.cpp
-    ./src/PacpusSerialPort.cpp
+    #./src/PacpusSerialPort.cpp
 )
 
@@ -56 +56 @@
     ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/AsyncWorkerBase.h
     ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PeriodicWorker.h
-    ${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PacpusSerialPort.h
+    #${PACPUS_INCLUDE_DIR}/Pacpus/PacpusTools/PacpusSerialPort.h
 )