From 156ad4bb6d7c789c4f4a1c7daf635eb7d3a92400 Mon Sep 17 00:00:00 2001
From: Brick <6098371+0x1F9F1@users.noreply.github.com>
Date: Fri, 15 Feb 2019 17:23:04 +0000
Subject: Greatly improved CMake builds + Fixed tests compilation

---
 examples/mlil_parser/CMakeLists.txt      | 58 +++++++-------------------------
 examples/mlil_parser/src/mlil_parser.cpp |  4 +--
 2 files changed, 15 insertions(+), 47 deletions(-)

(limited to 'examples/mlil_parser')

diff --git a/examples/mlil_parser/CMakeLists.txt b/examples/mlil_parser/CMakeLists.txt
index 4ec35591..4f4f450b 100644
--- a/examples/mlil_parser/CMakeLists.txt
+++ b/examples/mlil_parser/CMakeLists.txt
@@ -1,50 +1,18 @@
-# Mostly copied from https://github.com/Vector35/binaryninja-api/blob/dev/examples/breakpoint/CMakeLists.txt
+cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+project(mlil_parser CXX)
 
-project(MLIL_Parser)
+add_executable(${PROJECT_NAME}
+    src/mlil_parser.cpp)
 
-#-----------------------------------------------------------------------------
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
-#-----------------------------------------------------------------------------
-set(SRCS src/mlil_parser.cpp)
-#-----------------------------------------------------------------------------
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-#-----------------------------------------------------------------------------
-if(WIN32)
-	set(BINJA_DIR "C:\\Program Files\\Vector35\\BinaryNinja"
-		CACHE PATH "Binary Ninja installation directory")
-	set(BINJA_BIN_DIR "${BINJA_DIR}")
-	set(BINJA_PLUGINS_DIR "$ENV{APPDATA}/Binary Ninja/plugins"
-		CACHE PATH "Binary Ninja user plugins directory")
-elseif(APPLE)
-	set(BINJA_DIR "/Applications/Binary Ninja.app"
-		CACHE PATH "Binary Ninja installation directory")
-	set(BINJA_BIN_DIR "${BINJA_DIR}/Contents/MacOS")
-	set(BINJA_PLUGINS_DIR "$ENV{HOME}/Library/Application Support/Binary Ninja/plugins"
-		CACHE PATH "Binary Ninja user plugins directory")
-else()
-	set(BINJA_DIR "$ENV{HOME}/binaryninja"
-		CACHE PATH "Binary Ninja installation directory")
-	set(BINJA_BIN_DIR "${BINJA_DIR}")
-	set(BINJA_PLUGINS_DIR "$ENV{HOME}/.binaryninja/plugins"
-		CACHE PATH "Binary Ninja user plugins directory")
-endif()
-#-----------------------------------------------------------------------------
-add_executable (${PROJECT_NAME} ${SRCS})
-#-----------------------------------------------------------------------------
-find_library(BINJA_API_LIBRARY binaryninjaapi
-	HINTS ${CMAKE_CURRENT_SOURCE_DIR}/../../bin ${CMAKE_CURRENT_SOURCE_DIR}/../../bin/Release ${CMAKE_CURRENT_SOURCE_DIR}/../../bin/Debug)
-find_library(BINJA_CORE_LIBRARY binaryninjacore
-	HINTS ${BINJA_BIN_DIR})
-#-----------------------------------------------------------------------------
 target_link_libraries(${PROJECT_NAME}
-	${BINJA_API_LIBRARY}
-	${BINJA_CORE_LIBRARY}
-	)
-#-----------------------------------------------------------------------------
-install (TARGETS	${PROJECT_NAME}
-			RUNTIME DESTINATION bin
-			LIBRARY DESTINATION Lib
-			ARCHIVE DESTINATION Lib)
+    binaryninjaapi)
+
+if (NOT WIN32)
+    target_link_libraries(${PROJECT_NAME}
+    dl)
+endif()
 
+set_target_properties(${PROJECT_NAME} PROPERTIES
+    CXX_STANDARD 11
+    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../bin)
diff --git a/examples/mlil_parser/src/mlil_parser.cpp b/examples/mlil_parser/src/mlil_parser.cpp
index a9411251..d73df2bc 100644
--- a/examples/mlil_parser/src/mlil_parser.cpp
+++ b/examples/mlil_parser/src/mlil_parser.cpp
@@ -8,7 +8,7 @@ using namespace BinaryNinja;
 using namespace std;
 
 
-#ifndef __WIN32__
+#ifndef _WIN32
 #include <libgen.h>
 #include <dlfcn.h>
 static string GetPluginsDirectory()
@@ -24,7 +24,7 @@ static string GetPluginsDirectory()
 #else
 static string GetPluginsDirectory()
 {
-	return "C:\\Program Files\\Vector35\\Binary Ninja\\plugins\\";
+	return "C:\\Program Files\\Vector35\\BinaryNinja\\plugins\\";
 }
 #endif
 
-- 
cgit v1.3.1