fix missing find_library emit with -2

Author: mulle-nat

README.md

@@ -230,74 +230,7 @@ src/PBXWriting/PBXObject+PBXEncoding.m
 
 This is basically a stripped down version of `mulle_xcode_utility`.
 
-
-### Releasenotes
-
-##### 0.6.1
-
-* improve sexport reminder
-
-##### 0.6.0
-
-* there is a new option `-2`. It generates a `CMakeLists.txt` that includes
-a file called `CMakeSourcesAndHeaders.txt`. This is a file that you can generate
-with an additional run of `mulle-xcode-to-cmake sexport`.
-
-##### 0.5.4
-
-* the reminder is now more readable
-
-##### 0.5.3
-
-* added another little hack for mulle-objc
-* output commandline arguments in the reminder
-* sexport now also prints the reminder
-
-##### 0.5.2
-
-* add sexport command for generating source and header file lists
-* added -l switch, also for mulle-objc to specify the project language
-* fix a bug, when files are not group relative in Xcode
-
-##### 0.4.1
-
-* add a reminder how this file was generated. Actually useful sometimes.
-
-##### 0.4.0
-
-* whitespace in target names is converted to '-'
-* bundle targets are supported now
-* added -n flag
-* fix framework resource copy stage
-
-
-##### 0.3.0
-
-* don't emit link commands for static library targets
-* add -s option
-* slight reorganization of code
-* output filepaths sorted
-* fix some bugs
-* improved boiler-plate code
-
-
-##### 0.2.0
-
-* output resources too
-* allow to specify multiple targets
-* fix more bugs
-* add -u option, but iOS builds don't work anway
-* somewhat half hearted attempt to also support applications and bundles
-* quote paths with whitespace
-
-##### 0.1.0
-
-* Fix some bugs. Add -p and -f options.
-
-
-#### 0.0
-
-* Quickly hacked together from mulle-xcode-settings.
+See the [RELEASENOTES.md](RELEASENOTES.md) for what has changed.
 
 
 

RELEASENOTES.md

@@ -0,0 +1,73 @@
+### Releasenotes
+
+##### 0.6.2
+
+* improve Framework target output for not APPLE case
+* split off Releasenotes into separate file
+* fixed missing `find_library` and `target_include_directories` emission when using -2
+
+##### 0.6.1
+
+* improve sexport reminder
+
+##### 0.6.0
+
+* there is a new option `-2`. It generates a `CMakeLists.txt` that includes
+a file called `CMakeSourcesAndHeaders.txt`. This is a file that you can generate
+with an additional run of `mulle-xcode-to-cmake sexport`.
+
+##### 0.5.4
+
+* the reminder is now more readable
+
+##### 0.5.3
+
+* added another little hack for mulle-objc
+* output commandline arguments in the reminder
+* sexport now also prints the reminder
+
+##### 0.5.2
+
+* add sexport command for generating source and header file lists
+* added -l switch, also for mulle-objc to specify the project language
+* fix a bug, when files are not group relative in Xcode
+
+##### 0.4.1
+
+* add a reminder how this file was generated. Actually useful sometimes.
+
+##### 0.4.0
+
+* whitespace in target names is converted to '-'
+* bundle targets are supported now
+* added -n flag
+* fix framework resource copy stage
+
+
+##### 0.3.0
+
+* don't emit link commands for static library targets
+* add -s option
+* slight reorganization of code
+* output filepaths sorted
+* fix some bugs
+* improved boiler-plate code
+
+
+##### 0.2.0
+
+* output resources too
+* allow to specify multiple targets
+* fix more bugs
+* add -u option, but iOS builds don't work anway
+* somewhat half hearted attempt to also support applications and bundles
+* quote paths with whitespace
+
+##### 0.1.0
+
+* Fix some bugs. Add -p and -f options.
+
+
+#### 0.0
+
+* Quickly hacked together from mulle-xcode-settings.

mulle-xcode-to-cmake.xcodeproj/project.pbxproj

@@ -62,6 +62,7 @@
 		4101507214431CD70019AB2E /* PBXProjectProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBXProjectProxy.m; sourceTree = "<group>"; };
 		410F65C512C90A6D007EA949 /* PBXProject+Settings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "PBXProject+Settings.h"; sourceTree = "<group>"; };
 		410F65C612C90A6D007EA949 /* PBXProject+Settings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "PBXProject+Settings.m"; sourceTree = "<group>"; };
+		411386D61E9E7F12001B50D1 /* RELEASENOTES.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = RELEASENOTES.md; sourceTree = "<group>"; };
 		411FA53A12DA484F005C2979 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		4121674E12D897FB00D49F14 /* NSString+KeyFromSetterSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+KeyFromSetterSelector.h"; sourceTree = "<group>"; };
 		4121674F12D897FB00D49F14 /* NSString+KeyFromSetterSelector.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+KeyFromSetterSelector.m"; sourceTree = "<group>"; };
@@ -117,6 +118,7 @@
 			isa = PBXGroup;
 			children = (
 				41795C0F1BCA80CC00CEB1CE /* README.md */,
+				411386D61E9E7F12001B50D1 /* RELEASENOTES.md */,
 				41F6FBB51BC40248000C60B2 /* src */,
 				08FB779DFE84155DC02AAC07 /* External Frameworks and Libraries */,
 				1AB674ADFE9D54B511CA2CBB /* Products */,

src/mulle-xcode-to-cmake/main.m

@@ -432,10 +432,7 @@ static void   print_paths( NSArray *paths,
 }
 
 
-static void   print_files( NSArray *files,
-                           NSString *name,
-                           enum Command cmd,
-                           BOOL isHeader)
+static NSArray   *collect_paths( NSArray *files, BOOL isHeader)
 {
    NSEnumerator       *rover;
    NSMutableArray     *paths;
@@ -468,8 +465,7 @@ static void   print_files( NSArray *files,
 
       [paths addObject:path];
    }
-   
-   print_paths( paths, name);
+   return( paths);
 }
 
 
@@ -486,8 +482,8 @@ static void   print_files( NSArray *files,
 
 
 static void   print_libraries( NSArray *libraries,
-                              NSString *prefix,
-                              BOOL isStatic)
+                               NSString *prefix,
+                               BOOL isStatic)
 {
    NSEnumerator      *rover;
    NSString          *path;
@@ -728,12 +724,18 @@ static void   printcontext_target_properties( struct printcontext *ctxt)
                 ")\n"
                 "\n"
                 "   install( TARGETS %s DESTINATION \"Frameworks\")\n"
-                "endif()\n",
+                "else()\n"
+                "   install( TARGETS %s DESTINATION \"lib\" )\n"
+                "   install( FILES ${PUBLIC_HEADERS} DESTINATION \"include/%s\")\n"
+                "endif()\n"
+                "\n",
                 ctxt->s_target_name,
                 ctxt->s_target_name,
                 [headersName UTF8String],
                 [privheadersName UTF8String],
                 [resourcesName UTF8String],
+                ctxt->s_target_name,
+                ctxt->s_target_name,
                 ctxt->s_target_name);
          break;
 
@@ -983,50 +985,67 @@ static void   export_headers_phase( PBXHeadersBuildPhase *pbxphase,
                                     NSString *prefix)
 {
    NSString  *name;
+   NSArray   *paths;
+   BOOL       shouldPrint;
+   
+   shouldPrint = (cmd == SourceExport) || ! twoStageCMakeLists;
 
    name = @"PUBLIC_HEADERS";
    if( [prefix length])
       name = [NSString stringWithFormat:@"%@_%@", prefix, name];
-   print_files( [pbxphase publicHeaders], name, cmd, YES);
+   paths = collect_paths( [pbxphase publicHeaders], YES);
+   if( shouldPrint)
+      print_paths( paths, name);
 
-   if( cmd == SourceExport)
-      return;
-      
    name = @"PROJECT_HEADERS";
    if( [prefix length])
       name = [NSString stringWithFormat:@"%@_%@", prefix, name];
-   print_files( [pbxphase projectHeaders], name, cmd, YES);
+   paths = collect_paths( [pbxphase projectHeaders], YES);
+   if( shouldPrint)
+      print_paths( paths, name);
 
    name = @"PRIVATE_HEADERS";
    if( [prefix length])
       name = [NSString stringWithFormat:@"%@_%@", prefix, name];
-   print_files( [pbxphase privateHeaders], name, cmd, YES);
+   paths = collect_paths( [pbxphase privateHeaders], YES);
+   if( shouldPrint)
+      print_paths( paths, name);
 }
 
 
 static void   export_sources_phase( PBXSourcesBuildPhase *pbxphase,
                                    enum Command cmd,
                                    NSString *prefix)
 {
-   NSString  *name;
+   NSString   *name;
+   NSArray    *paths;
+
+   if( cmd == Export && twoStageCMakeLists)
+      return;
 
    name = @"SOURCES";
    if( [prefix length])
       name = [NSString stringWithFormat:@"%@_%@", prefix, name];
-   print_files( [pbxphase files], name, cmd, NO);
+   paths = collect_paths( [pbxphase files], NO);
+   print_paths( paths, name);
 }
 
 
 static void   export_resources_phase( PBXResourcesBuildPhase *pbxphase,
                                       enum Command cmd,
                                       NSString *prefix)
 {
-   NSString  *name;
+   NSString   *name;
+   NSArray    *paths;
+   
+   if( cmd == Export && twoStageCMakeLists)
+      return;
 
    name = @"RESOURCES";
    if( [prefix length])
       name = [NSString stringWithFormat:@"%@_%@", prefix, name];
-   print_files( [pbxphase files], name, cmd, NO);
+   paths = collect_paths( [pbxphase files], NO);
+   print_paths( paths, name);
 }
 
 
@@ -1057,9 +1076,7 @@ static void   collect_libraries( PBXFrameworksBuildPhase *pbxphase,
       }
       else
          if( ! isStatic)
-         {
             addSharedLibrariesToFind( path, libraryName);
-         }
    }
 }
 
@@ -1134,7 +1151,7 @@ static void   add_implicit_frameworks_if_needed( PBXTarget *pbxtarget)
 
    if( addFoundation)
    {
-      printf( "# uncomment this for mulle-objc\n"
+      printf( "# uncomment this for mulle-objc to search libraries first\n"
               "# set( CMAKE_FIND_FRAMEWORK \"LAST\")\n");
 
       addSharedLibrariesToFind( @"Foundation", @"FOUNDATION");
@@ -1165,9 +1182,7 @@ static void   file_exporter( PBXTarget *pbxtarget,
 
    rover = [[pbxtarget buildPhases] objectEnumerator];
    while( phase = [rover nextObject])
-   {
       export_phase( phase, cmd, multipleTargets ? makeMacroName( [pbxtarget name]) : nil);
-   }
 }
 
 
@@ -1255,16 +1270,15 @@ static void   exporter( PBXProject *root,
               "\n"
               "include( CMakeSourcesAndHeaders.txt)\n");
    }
-   else
+
+   rover = [targets objectEnumerator];
+   while( pbxtarget = [rover nextObject])
    {
-      rover = [targets objectEnumerator];
-      while( pbxtarget = [rover nextObject])
-      {
-         if( cmd == Export || cmd == SourceExport)
-            print_files_header_comment( [pbxtarget name]);
-         file_exporter( pbxtarget, cmd, multipleTargets);
-      }
+      if( (cmd == Export && ! twoStageCMakeLists) || cmd == SourceExport)
+         print_files_header_comment( [pbxtarget name]);
+      file_exporter( pbxtarget, cmd, multipleTargets);
    }
+   
    // ugliness ensues...
 
    if( cmd != Export)