Added CMake support for Visual Studio/Xcode/Android generator #1594

chaoticbob · 2016-10-01T20:56:14Z

Updated Windows platform specific CMake related files to build on Windows. Corrected some of the additions of preprocessor definitions. Updated ci_make_app macro to generate the right settings for apps. Tested against Cube, CubeMapping, ShadowMapping, and Extrude on Visual Studio 2013 and Visual Studio 2015.

…roid_linux

richardeakin · 2016-10-03T23:15:06Z

CMakeLists.txt

@@ -1,6 +1,15 @@
 cmake_minimum_required( VERSION 3.0 FATAL_ERROR )
 set( CMAKE_VERBOSE_MAKEFILE ON )

+# Configure the Android toolchain before the project start
+if( CINDER_TARGET )


I think this should be a part of configure.cmake, which sets up the CINDER_TARGET along with other important variables used on all platforms.

But perhaps the cinderAndreoidToolchain.cmake must be included before the call to project( cinder )? If that is the case, I think that the project() call can be moved to after the include( configure.cmake ).

The compiler checks seem to happen when you project() is called. I think on most platform this is fine, but on Android since we have to do a manual toolchain setup, it needs to happen before project(). Certainly not married to this solution, so if we can move stuff around to make it more sane, would be great.

I seems that the proper ( in terms of CMake ) way to do this would be using CMake's toolchain functionality. See here and here. This functionality would also be interesting to explore in the case of Linux / RPi .

Oh yeah, forgot about the toolchain feature. I'll move this to a toolchain file approach over the weekend.

richardeakin · 2016-10-03T23:24:00Z

proj/cmake/modules/cinderMakeApp.cmake

+			# Force multiprocess compilation
+			add_compile_options( /MP )
+			# Add necessary platform libraries		
+			list( APPEND PLATFORM_LIBRARIES "zlib.lib;shlwapi.lib;OpenGL32.lib" )


On OS X, we handled this as part of libcinder's target_link_libraries() (here) Its pretty nice this way because then anyone who does a find_package( cinder ) will get linked to the required libraries, even if they aren't using ci_make_app() (like if they already have a different cmake setup).

I'll try moving it to target_link_libraries - I can't remember right now if there was a specific reason for this.

Moved this to a more explicit location: 76f8781

Updated this to be deps on lib cinder: c47e1de

richardeakin · 2016-10-03T23:24:09Z

proj/cmake/modules/cinderMakeApp.cmake

+			# Add lib dirs
+			cmake_policy( PUSH )
+			cmake_policy( SET CMP0015 OLD )
+			link_directories( "${CINDER_PATH}/${CINDER_LIB_DIRECTORY}" )


I think in general @PetrosKataras was advocating that we use the target_* variants as much as possible. Is there a way to do this with link_directories() too?

I looked around for a bit and could not find a way. Happy to change if you guys have a suggestion.

There is no target_* variant for link_directories but what I am actually wondering is if this is needed at all. In theory ( and in practice as it happens for Linux / OS X for example ) the previous call to find_package( cinder ) together with the target_link_libraries( myapp cinder ) that follows should take care of finding and linking with Cinder without the need for manually specifying link directories.. But maybe this is not the case for the Visual Studio generator?

CMake has historically had issues with the rules imposed by MSBuild and build systems like Jam that it has to do some weird jumping around. For instance the output path or the ignoring specific library. We have to override these and or put them in as forced flags. link_directories make it easier to deal with things like this: libboost_filesystem-vc120-mt-sgd-1_60.lib. This leverages the auto linking feature in Visual C++ and doesn't lock you into a specific build of Boost - especially one that's tagged with a version number. In the near future we won't have to deal with this because we won't have a dependency on Boost. But for now, short of attempting to detect the version of Boost, it's easier to let Visual C++ handle it for you by using link_directories.

Just noticed that some static libs on Windows can be added into the cinder.lib and we don't have to explicitly add them to the app target. It's not clear to me how these are propagated or inherited.

Let me try moving some of this around to see if it works.

Okay, moved what I could so find_package( cinder ) picks up on the deps.

Personally I don't have a strong opinion regarding link_directories as long as we can keep the usage of it just for edge cases like this one. I just look forward to moving away from Boost as a dependency..

We don't really have an option on Windows for this. Unless we want to glob and parse the Boost libraries.

So I actually implemented the globbing and it worked. But then I realized that it would make it really difficult for the CMake generated lib to interact with the handmade project files. So it seems like link_directories() is the most reasonable thing to do for now.

…roid_linux

PetrosKataras · 2016-10-05T06:42:55Z

proj/cmake/libcinder_target.cmake

@@ -24,11 +24,12 @@ target_include_directories( cinder SYSTEM BEFORE INTERFACE ${CINDER_INCLUDE_SYST
 target_include_directories( cinder BEFORE PRIVATE ${CINDER_INCLUDE_USER_PRIVATE} )
 target_include_directories( cinder SYSTEM BEFORE PRIVATE ${CINDER_INCLUDE_SYSTEM_PRIVATE} )

-target_link_libraries( cinder PUBLIC ${CINDER_LIBS_DEPENDS} )
+target_link_libraries( cinder PUBLIC ${CINDER_LIBS_DEPENDS}  )
+target_link_libraries( cinder LINK_PRIVATE Ws2_32.lib  )


I think this line should be removed since a) it would 'leak' to non-windows platforms and b) it has been integrated in platform_msw.cmake as part of CINDER_LIBS_DEPENDS here?

Sorry, that was apart of my experimenting to find some better way to propagate the link flags. It's been removed now.

…dmade files

richardeakin · 2016-10-10T04:58:26Z

proj/cmake/configure.cmake

-	set( CINDER_ANDROID_NDK_ARCH "armeabi-v7a" CACHE STRING "Android NDK target architecture." )
-
-	set( CINDER_TARGET_SUBFOLDER "android-${CINDER_ANDROID_NDK_PLATFORM/CINDER_ANDROID_NDK_ARCH" )
+	#set( CINDER_ANDROID_NDK_PLATFORM 21 CACHE STRING "Android NDK Platform version number." )


Don't we want to expose these variables to the cmake cache somehow?

Also, I do like that they are in configure.cmake as this file is shared by both libcinder and app builds.

richardeakin · 2016-10-10T04:59:49Z

proj/cmake/libcinder_target.cmake


 target_compile_definitions( cinder PUBLIC ${CINDER_DEFINES} )

+# Visual Studio and Xcode generators adds a ${CMAKE_BUILD_TYPE} to the ARCHIVE 
+# and LIBRARY directories. Override the directories so, ${CMAKE_BUILD_TYPE} doesn't double up.
+if( CINDER_MSW )


Can this live in platform_msw.cmake?

richardeakin · 2016-10-10T04:59:59Z

proj/cmake/libcinder_target.cmake

+        STATIC_LIBRARY_FLAGS_MINSIZEREL			"${CINDER_STATIC_LIBS_FLAGS_RELEASE} ${CINDER_STATIC_LIBS_DEPENDS_RELEASE}"
+        STATIC_LIBRARY_FLAGS_RELWITHDEBINFO		"${CINDER_STATIC_LIBS_FLAGS_RELEASE} ${CINDER_STATIC_LIBS_DEPENDS_RELEASE}" 
+    )    
+elseif( CINDER_MAC )


Can this live in platform_macosx.cmake?

richardeakin · 2016-10-10T05:02:33Z

proj/cmake/modules/cinderMakeApp.cmake

 	endif()

 	add_executable( ${ARG_APP_NAME} MACOSX_BUNDLE WIN32 ${ARG_SOURCES} ${ICON_PATH} ${ARG_RESOURCES} )

 	target_include_directories( ${ARG_APP_NAME} PUBLIC ${ARG_INCLUDES} )
 	target_link_libraries( ${ARG_APP_NAME} cinder ${ARG_LIBRARIES} )

+	# Ignore Specific Default Libraries
+	if( MSVC )
+		set_target_properties( ${ARG_APP_NAME} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT /NODEFAULTLIB:LIBCPMT" )


If we set this on the cinder target, won't they get picked up as the app depends on that package? That way we can keep them grouped together.

richardeakin · 2016-10-10T05:03:12Z

proj/cmake/platform_macosx.cmake

+set( CINDER_STATIC_LIBS_DEPENDS "${MACOS_SUBFOLDER}/libboost_filesystem.a ${MACOS_SUBFOLDER}/libboost_system.a ${MACOS_SUBFOLDER}/libz.a" )
+
+if( NOT ( "Xcode" STREQUAL "${CMAKE_GENERATOR}" ) )
+	if(NOT CMAKE_LIBTOOL)


Add comment as to why we need to use libtool instead of ar / ranlib (partially because that's what xcode does).

richardeakin · 2016-10-10T05:38:27Z

Merging this as it is getting long and the remaining notes are mostly clean up, can be done afterwards.

Hai Nguyen added 12 commits October 1, 2016 08:59

Merged with upstream

12d5624

Updated boost submodule to latest version

f3aceb0

Updated boost submodule to latest version

eac042c

Added cmake support for Visual Studio generator

b55ac1c

Combined adding of FreeType defines

db1ee14

Added toolchain configuration CMake files for Android

7b0fc60

Added architectural flags and include paths for Android

0344c7a

Updated for building Android on Linux

e4b5aa1

Added some clarification comments

9f70b28

Merge branch 'android_linux' of github.com:chaoticbob/Cinder into and…

ecea23f

…roid_linux

Updated library output location for Windows

e2f161b

Tweaked for Xcode project generation

57336d4

chaoticbob changed the title ~~Added CMake support for Visual Studio generator on Windows~~ Added CMake support for Visual Studio/Xcode/Android generator Oct 3, 2016

Added host definition for Android building on macOS host

ead79ef

richardeakin added the build system label Oct 3, 2016

richardeakin reviewed Oct 3, 2016

View reviewed changes

Hai Nguyen added 5 commits October 4, 2016 07:13

Moved platform specific libs for Windows to more explicit location

76f8781

Merge branch 'android_linux' of github.com:chaoticbob/Cinder into and…

7963612

…roid_linux

Moved msw platform libraries to be dependencies on libcinder

c47e1de

Merge remote-tracking branch 'upstream/android_linux' into android_linux

edcb00e

Cleaned up msw depends

e8d2c32

PetrosKataras reviewed Oct 5, 2016

View reviewed changes

Hai Nguyen added 8 commits October 5, 2016 06:45

Removed unnecessary public definition for library

4e25321

Added x64 target

29dc378

Added STB source and target files

af3496f

Added static lib deps and flags to allow cross usage of CMake and han…

092bb44

…dmade files

Removed references to WIC sources. Added STB files.

d7a539f

Updated to allow cross builds between CMake and Xcode

fb32789

Updated to support cross builds with make and Ninja

b9d24d7

Added x64 targets

9f99062

Updated for cross building with NMake and Ninja

81d948f

richardeakin reviewed Oct 10, 2016

View reviewed changes

richardeakin mentioned this pull request Oct 10, 2016

Android BasicApp build fails on OS X #1601

Closed

richardeakin merged commit 8553d84 into cinder:android_linux Oct 10, 2016

richardeakin mentioned this pull request Oct 11, 2016

Move android-specific cmake build system to cross-platform proj/cmake #1484

Closed

paulhoux mentioned this pull request Feb 10, 2020

CMake support for shared library and Visual Studio 2019 #2133

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added CMake support for Visual Studio/Xcode/Android generator #1594

Added CMake support for Visual Studio/Xcode/Android generator #1594

chaoticbob commented Oct 1, 2016

richardeakin Oct 3, 2016

chaoticbob Oct 3, 2016

PetrosKataras Oct 5, 2016

chaoticbob Oct 5, 2016

richardeakin Oct 3, 2016

chaoticbob Oct 3, 2016

chaoticbob Oct 4, 2016

chaoticbob Oct 4, 2016

richardeakin Oct 3, 2016

chaoticbob Oct 3, 2016

PetrosKataras Oct 4, 2016 •

edited

Loading

chaoticbob Oct 4, 2016 •

edited

Loading

chaoticbob Oct 4, 2016 •

edited

Loading

chaoticbob Oct 4, 2016

PetrosKataras Oct 5, 2016

chaoticbob Oct 5, 2016 •

edited

Loading

chaoticbob Oct 6, 2016

PetrosKataras Oct 5, 2016

chaoticbob Oct 5, 2016

richardeakin Oct 10, 2016

richardeakin Oct 10, 2016

richardeakin Oct 10, 2016

richardeakin Oct 10, 2016

richardeakin Oct 10, 2016

richardeakin commented Oct 10, 2016

Added CMake support for Visual Studio/Xcode/Android generator #1594

Added CMake support for Visual Studio/Xcode/Android generator #1594

Conversation

chaoticbob commented Oct 1, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

PetrosKataras Oct 4, 2016 • edited Loading

Choose a reason for hiding this comment

chaoticbob Oct 4, 2016 • edited Loading

Choose a reason for hiding this comment

chaoticbob Oct 4, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chaoticbob Oct 5, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

richardeakin commented Oct 10, 2016

PetrosKataras Oct 4, 2016 •

edited

Loading

chaoticbob Oct 4, 2016 •

edited

Loading

chaoticbob Oct 4, 2016 •

edited

Loading

chaoticbob Oct 5, 2016 •

edited

Loading