Merge pull request #74 from commontk/fix-launcherlib-abi-2

Fix launcherlib abi

Author: jcfr

Base/CMakeLists.txt

@@ -13,20 +13,63 @@ configure_file(
 set(KIT_include_directories
   )
 
+# Source files
+set(KIT_SRCS
+  ctkAppLauncherSettings.cpp
+  ctkAppLauncherSettings.h
+  ctkAppLauncherSettings_p.h
+  ctkSettingsHelper.cpp
+  ctkSettingsHelper.h
+  )
+
+# Headers that should run through moc
+set(KIT_MOC_SRCS
+  ctkAppLauncherSettings.h
+  ctkAppLauncherSettings_p.h
+  )
+
+# Resources
+set(KIT_resources
+  )
+
+# Target libraries
+set(KIT_target_libraries
+  ${QT_LIBRARIES}
+  )
+
+ctkMacroBuildLib(
+  NAME CTKAppLauncherLib
+  INCLUDE_DIRECTORIES ${KIT_include_directories}
+  INSTALL_INCLUDE_DIRECTORIES "${CTK_INSTALL_INCLUDE_DIR}"
+  SRCS ${KIT_SRCS}
+  MOC_SRCS ${KIT_MOC_SRCS}
+  TARGET_LIBRARIES ${KIT_target_libraries}
+  RESOURCES ${KIT_resources}
+  LIBRARY_TYPE "STATIC"
+  LABEL ctkAppLauncher
+  )
+
+# Export targets for build tree
+set_property(GLOBAL APPEND PROPERTY CTKAppLauncherLib_TARGETS CTKAppLauncherLib)
+
+# Export targets for install tree
+if(CTK_BUILD_SHARED_LIBS OR CTKAppLauncher_INSTALL_LauncherLibrary)
+  install(TARGETS CTKAppLauncherLib
+    EXPORT CTKAppLauncherLibTargets
+    RUNTIME DESTINATION ${CTK_INSTALL_BIN_DIR} COMPONENT Runtime
+    LIBRARY DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Runtime
+    ARCHIVE DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Development)
+endif()
+
 # Source files
 set(KIT_SRCS
   ctkAppArguments.cpp
   ctkAppArguments.h
   ctkAppLauncher.cpp
   ctkAppLauncher.h
   ctkAppLauncher_p.h
-  ctkAppLauncherSettings.cpp
-  ctkAppLauncherSettings.h
-  ctkAppLauncherSettings_p.h
   ctkCommandLineParser.cpp
   ctkCommandLineParser.h
-  ctkSettingsHelper.cpp
-  ctkSettingsHelper.h
   )
 
 # Headers that should run through moc
@@ -45,6 +88,7 @@ set(KIT_resources
 # Target libraries
 set(KIT_target_libraries
   ${QT_LIBRARIES}
+  CTKAppLauncherLib
   )
 
 ctkMacroBuildLib(

CMake/CTKAppLauncherLibConfig.cmake.in

@@ -8,4 +8,4 @@ if(NOT CTKAppLauncherLib_TARGETS_IMPORTED)
   include(${CTKAppLauncherLib_TARGETS})
 endif()
 
-set(CTKAppLauncherLib_LIBRARIES CTKAppLauncherBase)
+set(CTKAppLauncherLib_LIBRARIES "@CTKAppLauncherLib_TARGETS@")

CMake/ctkMacroBuildLib.cmake

@@ -113,18 +113,6 @@ macro(ctkMacroBuildLib)
     set_target_properties(${lib_name} PROPERTIES ${CTK_LIBRARY_PROPERTIES})
   endif()
 
-  # Export targets
-  set_property(GLOBAL APPEND PROPERTY CTKAppLauncherLib_TARGETS ${lib_name})
-
-  # Install rules
-  if(CTK_BUILD_SHARED_LIBS OR CTKAppLauncher_INSTALL_LauncherLibrary)
-    install(TARGETS ${lib_name}
-      EXPORT CTKAppLauncherLibTargets
-      RUNTIME DESTINATION ${CTK_INSTALL_BIN_DIR} COMPONENT Runtime
-      LIBRARY DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Runtime
-      ARCHIVE DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Development)
-  endif()
-
   set(my_libs
     ${${prefix}_TARGET_LIBRARIES}
     )

CMakeLists.txt

@@ -325,6 +325,10 @@ install(FILES
   CTKAppLauncherSettings.ini.in
   DESTINATION ${CTK_INSTALL_BIN_DIR} COMPONENT Development)
 
+# Retrieve CTKAppLauncherLib used to configure 'CTKAppLauncherLibConfig.cmake' and
+# 'CTKAppLauncherLibTargets.cmake'.
+get_property(CTKAppLauncherLib_TARGETS GLOBAL PROPERTY CTKAppLauncherLib_TARGETS)
+
 # Configure 'CTKAppLauncherLibConfig.cmake' for a build tree
 include(CMakePackageConfigHelpers)
 set(CONFIG_DIR_CONFIG ${PROJECT_BINARY_DIR})
@@ -349,7 +353,6 @@ configure_package_config_file(
     )
 
 # Configure 'CTKAppLauncherLibTargets.cmake'
-get_property(CTKAppLauncherLib_TARGETS GLOBAL PROPERTY CTKAppLauncherLib_TARGETS)
 export(TARGETS ${CTKAppLauncherLib_TARGETS} FILE ${PROJECT_BINARY_DIR}/CTKAppLauncherLibTargets.cmake)
 
 # Install 'CTKAppLauncherLibConfig.cmake'

Testing/LauncherLib/AppWithLauncherLib/main.cpp

@@ -274,6 +274,71 @@ int checkReadSettingsWithoutExpand()
                 << "<APPLAUNCHER_DIR>/libexec/<env:BAR>"
         );
 
+  //
+  // pathsEnvVars
+  //
+
+  QHash<QString, QStringList> pathsEnvVars =
+      appLauncherSettings.pathsEnvVars(/* expand= */ false);
+
+#if defined(Q_OS_WIN32)
+  CHECK_QSTRINGLIST(
+        pathsEnvVars.value("PATH"),
+        QStringList()
+                << "<APPLAUNCHER_DIR>/cow"
+                << "/path/to/pig-<env:BOTH>"
+                << "/path/to/<env:PET>"
+                << "/path/to/libA"
+                << "<APPLAUNCHER_DIR>/libB"
+                << "/path/to/libC-<env:PET>"
+        );
+#else
+  CHECK_QSTRINGLIST(
+        pathsEnvVars.value("PATH"),
+        QStringList()
+                << "<APPLAUNCHER_DIR>/cow"
+                << "/path/to/pig-<env:BOTH>"
+                << "/path/to/<env:PET>"
+        );
+
+  CHECK_QSTRINGLIST(
+        pathsEnvVars.value(appLauncherSettings.libraryPathVariableName()),
+        QStringList()
+                << "/path/to/libA"
+                << "<APPLAUNCHER_DIR>/libB"
+                << "/path/to/libC-<env:PET>"
+        );
+#endif
+
+  CHECK_QSTRINGLIST(
+        pathsEnvVars.value("PYTHONPATH"),
+        QStringList()
+                << "<APPLAUNCHER_DIR>/lib/python/site-packages"
+                << "/path/to/site-packages-2"
+        );
+
+  CHECK_QSTRINGLIST(
+        pathsEnvVars.value("QT_PLUGIN_PATH"),
+        QStringList()
+                << "<APPLAUNCHER_DIR>/libexec/qt"
+                << "<APPLAUNCHER_DIR>/libexec/<env:BAR>"
+        );
+
+#if defined(Q_OS_WIN32)
+  int expectedPathsEnvVarsCount = 3;
+#else
+  int expectedPathsEnvVarsCount = 4;
+#endif
+  if (pathsEnvVars.count() != expectedPathsEnvVarsCount)
+    {
+    qWarning() << "Line" << __LINE__ << __FILE__ << "\n"
+               << "pathsEnvVars has not the expected number of entries\n"
+               << "current:" << pathsEnvVars.count() << "\n"
+               << "expected:" << expectedPathsEnvVarsCount << "\n"
+               << "current list:" << pathsEnvVars;
+    return EXIT_FAILURE;
+    }
+
   return EXIT_SUCCESS;
 }
 
@@ -368,6 +433,71 @@ int checkReadSettingsWithExpand()
                 << "/awesome/path/to/libexec/ASSOCIATION"
         );
 
+  //
+  // pathsEnvVars
+  //
+
+  QHash<QString, QStringList> pathsEnvVars =
+      appLauncherSettings.pathsEnvVars();
+
+#if defined(Q_OS_WIN32)
+  CHECK_QSTRINGLIST(
+        pathsEnvVars.value("PATH"),
+        QStringList()
+                << "/awesome/path/to/cow"
+                << "/path/to/pig-cat-and-dog"
+                << "/path/to/dog"
+                << "/path/to/libA"
+                << "/awesome/path/to/libB"
+                << "/path/to/libC-dog"
+        );
+#else
+  CHECK_QSTRINGLIST(
+        pathsEnvVars.value("PATH"),
+        QStringList()
+                << "/awesome/path/to/cow"
+                << "/path/to/pig-cat-and-dog"
+                << "/path/to/dog"
+        );
+
+  CHECK_QSTRINGLIST(
+        pathsEnvVars.value(appLauncherSettings.libraryPathVariableName()),
+        QStringList()
+                << "/path/to/libA"
+                << "/awesome/path/to/libB"
+                << "/path/to/libC-dog"
+        );
+#endif
+
+  CHECK_QSTRINGLIST(
+        pathsEnvVars.value("PYTHONPATH"),
+        QStringList()
+                << "/awesome/path/to/lib/python/site-packages"
+                << "/path/to/site-packages-2"
+        );
+
+  CHECK_QSTRINGLIST(
+        pathsEnvVars.value("QT_PLUGIN_PATH"),
+        QStringList()
+                << "/awesome/path/to/libexec/qt"
+                << "/awesome/path/to/libexec/ASSOCIATION"
+        );
+
+#if defined(Q_OS_WIN32)
+  int expectedPathsEnvVarsCount = 3;
+#else
+  int expectedPathsEnvVarsCount = 4;
+#endif
+  if (pathsEnvVars.count() != expectedPathsEnvVarsCount)
+    {
+    qWarning() << "Line" << __LINE__ << __FILE__ << "\n"
+               << "pathsEnvVars has not the expected number of entries\n"
+               << "current:" << pathsEnvVars.count() << "\n"
+               << "expected:" << expectedPathsEnvVarsCount << "\n"
+               << "current list:" << pathsEnvVars;
+    return EXIT_FAILURE;
+    }
+
   return EXIT_SUCCESS;
 }