cmake macos, more fixes and cleanup

CMakeLists.txt

@@ -127,8 +127,11 @@ else ()
 
     # Always "found", given last block.
     include_directories(${CRYPTOPP_INCLUDE_DIR})
+
+	if (NOT APPLE)
 		link_directories(${CRYPTOPP_LIBRARIES})
 	endif ()
+endif ()
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 	link_directories(/usr/local/lib)

alethzero/CMakeLists.txt

@@ -50,34 +50,40 @@ else ()
 endif ()
 
 qt5_use_modules(${EXECUTEABLE} Core Gui Widgets Network)
-target_link_libraries(${EXECUTEABLE} ethereum)
-
+target_link_libraries(${EXECUTEABLE} ethereum secp256k1 cryptopp)
 
 if (APPLE)
+	target_link_libraries(${EXECUTEABLE} boost_system boost_filesystem gmp leveldb miniupnpc snappy)
 	set_target_properties(${EXECUTEABLE} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/EthereumMacOSXBundleInfo.plist.in")
 
-	set_source_files_properties(${EXECUTEABLE} PROPERTIES MACOSX_PACKAGE_LOCATION MacOS)
+	SET_SOURCE_FILES_PROPERTIES(${EXECUTEABLE} PROPERTIES MACOSX_PACKAGE_LOCATION MacOS)
 
-	# This is a workaround for when the build-type defaults to Debug, but isn't
-	# populated for macros.
-	if (NOT CMAKE_BUILD_TYPE)
-		set(CMAKE_BUILD_TYPE Debug)
+	# This is a workaround for when the build-type defaults to Debug, and when a multi-config generator like xcode is used, where the type
+	# will not be set but defaults to release.
+	set(generator_lowercase "${CMAKE_GENERATOR}")
+	string(TOLOWER "${CMAKE_GENERATOR}" generator_lowercase)
+	if (generator_lowercase STREQUAL "xcode")
+		# TODO: Not sure how to resolve this. Possibly \${TARGET_BUILD_DIR}
+		set(binary_build_dir "${CMAKE_CURRENT_BINARY_DIR}/Debug")
+	else ()
+		set(binary_build_dir "${CMAKE_CURRENT_BINARY_DIR}")
 	endif ()
 
-	set(BUILD_TYPE ${CMAKE_BUILD_TYPE})
 	get_filename_component(APP_INSTALL_PATH ${CMAKE_INSTALL_PREFIX} REALPATH)
-	set(APPS ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/${EXECUTEABLE}.app) # CMAKE_CURRENT_BINARY_DIR, CMAKE_RUNTIME_OUTPUT_DIRECTORY
+	set(APPS ${binary_build_dir}/${EXECUTEABLE}.app)
+
 	install(CODE "
 		include(BundleUtilities)
 		set(BU_CHMOD_BUNDLE_ITEMS 1)
-		fixup_bundle(\"${APPS}\" \"${BUNDLELIBS}\" \"\")
+		fixup_bundle(\"${APPS}\" \"${BUNDLELIBS}\" \"../libethereum ../secp256k1\")
 		" COMPONENT RUNTIME )
 	
 	add_custom_target(addframeworks ALL
-		COMMAND /usr/local/opt/qt5/bin/macdeployqt ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/${EXECUTEABLE}.app
+		COMMAND /usr/local/opt/qt5/bin/macdeployqt ${binary_build_dir}/${EXECUTEABLE}.app
 		WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
 		DEPENDS ${PROJECT_NAME}
 	)
+
 elseif (${TARGET_PLATFORM} STREQUAL "w64")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-keep-inline-dllexport -static-libgcc -static-libstdc++ -static")
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-s -Wl,-subsystem,windows -mthreads -L/usr/x86_64-w64-mingw32/plugins/platforms")

libethereum/CMakeLists.txt

@@ -4,10 +4,11 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")
 
 aux_source_directory(. SRC_LIST)
 
-if(NOT APPLE)
-	add_library(ethereum ${SRC_LIST})
-else()
+if(APPLE)
+	set(CMAKE_INSTALL_PREFIX ../lib)
 	add_library(ethereum SHARED ${SRC_LIST})
+else()
+	add_library(ethereum ${SRC_LIST})
 endif()
 
 file(GLOB HEADERS "*.h") 
@@ -37,6 +38,7 @@ else ()
 	target_link_libraries(ethereum ${CMAKE_THREAD_LIBS_INIT})
 endif ()
 
+target_link_libraries(ethereum cryptopp)
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 	include_directories(/usr/local/include)
 endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

secp256k1/CMakeLists.txt

@@ -3,10 +3,11 @@ cmake_policy(SET CMP0015 NEW)
 set(CMAKE_ASM_COMPILER "yasm")
 
 #aux_source_directory(. SRC_LIST)
-if(NOT APPLE)
-	add_library(secp256k1 secp256k1.c field_5x52_asm.asm)
-else()
+if(APPLE)
+	set(CMAKE_INSTALL_PREFIX ../lib)
 	add_library(secp256k1 SHARED secp256k1.c field_5x52_asm.asm)
+else()
+	add_library(secp256k1 secp256k1.c field_5x52_asm.asm)
 endif()
 
 #set(CMAKE_C_FLAGS "-DUSE_FIELD_5X52 -DUSE_FIELD_5X52_ASM -DUSE_NUM_OPENSSL -DUSE_FIELD_INV_BUILTIN")