Rework build flags

Also cleanup CMake a bit and add install/uninstall targets
CMake Caching is evil

Author: jtanx

.gitignore

@@ -38,7 +38,9 @@ CMakeFiles/
 Testing/
 Makefile
 cmake_install.cmake
+cmake_uninstall.cmake
 CTestTestfile.cmake
+install_manifest.txt
 bin/
 lib/
 tags

CMakeLists.txt

@@ -54,10 +54,11 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
 # Make the library
+option (BUILD_SHARED_LIBS "Build shared libraries instead of static libraries" OFF)
 add_library(clipboard ${HEADERS} ${SOURCE})
 
 # Testing mode?
-set (test OFF CACHE BOOL "Enable libclipboard unit testing (default:off)")
+option (test "Enable libclipboard unit testing (default:off)" OFF)
 if (test)
     # gtest does not play well with pthreads and mingw
     if (MINGW)
@@ -67,14 +68,30 @@ if (test)
         # Runtime library conflicts
         set(gtest_force_shared_crt ON CACHE BOOL "Always use dynamic runtime library (default:on)" )
     endif()
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/third_party/googletest)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/third_party/googletest EXCLUDE_FROM_ALL)
     enable_testing()
     include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/test)
 endif()
 
 # Build sample executables?
-set (samples OFF CACHE BOOL "Build libclipboard sample executables (default:off)")
+option (samples "Build libclipboard sample executables (default:off)" OFF)
 if (samples)
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/samples)
 endif()
+
+# Install options
+install(TARGETS clipboard
+        RUNTIME DESTINATION bin
+        LIBRARY DESTINATION lib
+        ARCHIVE DESTINATION lib)
+install(FILES ${HEADERS} DESTINATION include)
+
+# uninstall target
+configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+    IMMEDIATE @ONLY)
+
+add_custom_target(uninstall
+    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)

cmake_uninstall.cmake.in

@@ -0,0 +1,21 @@
+if(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+  message(FATAL_ERROR "Cannot find install manifest: @CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+endif(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+
+file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+string(REGEX REPLACE "\n" ";" files "${files}")
+foreach(file ${files})
+  message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
+  if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+    exec_program(
+      "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+      OUTPUT_VARIABLE rm_out
+      RETURN_VALUE rm_retval
+      )
+    if(NOT "${rm_retval}" STREQUAL 0)
+      message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
+    endif(NOT "${rm_retval}" STREQUAL 0)
+  else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+    message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
+  endif(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+endforeach(file)

include/libclipboard.h

@@ -6,6 +6,26 @@
 #ifndef _LIBCLIPBOARD_H_
 #define _LIBCLIPBOARD_H_
 
+#if (defined(_WIN32) || defined(LIBCLIPBOARD_FORCE_WIN32)) && \
+    !defined(LIBCLIPBOARD_FORCE_X11) && !defined(LIBCLIPBOARD_FORCE_COCOA)
+#  define LIBCLIPBOARD_BUILD_WIN32
+#endif
+
+#if (defined(__linux__) || defined(LIBCLIPBOARD_FORCE_X11)) && \
+    !defined(LIBCLIPBOARD_FORCE_WIN32) && !defined(LIBCLIPBOARD_FORCE_COCOA)
+#  define LIBCLIPBOARD_BUILD_X11
+#endif
+
+#if (defined(__APPLE__) || defined(LIBCLIPBOARD_FORCE_COCOA)) && \
+    !defined(LIBCLIPBOARD_FORCE_WIN32) && !defined(LIBCLIPBOARD_FORCE_X11)
+#  define LIBCLIPBOARD_BUILD_COCOA
+#endif
+
+#if !defined(LIBCLIPBOARD_BUILD_WIN32) && !defined(LIBCLIPBOARD_BUILD_X11) && \
+    !defined(LIBCLIPBOARD_BUILD_COCOA)
+#  error "Unsupported platform or invalid build flags"
+#endif
+
 #include <stdbool.h>
 #include <stdint.h>
 
@@ -54,12 +74,6 @@ typedef struct clipboard_opts {
 /** Opaque data structure for a clipboard context/instance **/
 typedef struct clipboard_c clipboard_c;
 
-#if !defined(_WIN32) && !defined(LIBCLIPBOARD_FORCE_WIN32) && \
-    !defined(__linux__) && !defined(LIBCLIPBOARD_FORCE_X11) && \
-    !defined(__APPLE__) && !defined(LIBCLIPBOARD_FORCE_COCOA)
-#  error "Unsupported platform"
-#endif
-
 /**
  *  \brief Instantiates a new clipboard instance of the given type.
  *

src/clipboard_cocoa.c

@@ -3,7 +3,8 @@
  *  \brief OS X (Cocoa) implementation of the clipboard.
  */
 
-#if defined __APPLE__ || LIBCLIPBOARD_FORCE_COCOA
+#include "libclipboard.h"
+#ifdef LIBCLIPBOARD_BUILD_COCOA
 
 #include "libclipboard.h"
 #include <stdlib.h>
@@ -89,6 +90,4 @@ bool clipboard_set_text_ex(clipboard_c *cb, const char *src, int length, clipboa
     return ret;
 }
 
-#else
-typedef int cocoa_dummy_define;
-#endif /* __APPLE__ || LIBCLIPBOARD_FORCE_COCOA */
+#endif /* LIBCLIPBOARD_BUILD_COCOA */

src/clipboard_win32.c

@@ -3,7 +3,9 @@
  *  \brief Windows implementation of the clipboard.
  */
 
-#if defined _WIN32 || LIBCLIPBOARD_FORCE_WIN32
+#include "libclipboard.h"
+
+#ifdef LIBCLIPBOARD_BUILD_WIN32
 
 #include "libclipboard.h"
 #include <windows.h>
@@ -216,6 +218,4 @@ bool clipboard_set_text_ex(clipboard_c *cb, const char *src, int length, clipboa
     return true;
 }
 
-#else
-typedef int win32_dummy_define;
-#endif /* _WIN32 || LIBCLIPBOARD_FORCE_WIN32 */
+#endif /* LIBCLIPBOARD_BUILD_WIN32 */

src/clipboard_x11.c

@@ -5,10 +5,10 @@
  *  Blegh I hate X11
  */
 
-#if defined __linux__ || LIBCLIPBOARD_FORCE_X11
-
 #include "libclipboard.h"
 
+#ifdef LIBCLIPBOARD_BUILD_X11
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
@@ -665,6 +665,4 @@ bool clipboard_set_text_ex(clipboard_c *cb, const char *src, int length, clipboa
     return ret;
 }
 
-#else
-typedef int x11_dummy_define;
-#endif /* __linux__ || LIBCLIPBOARD_FORCE_X11 */
+#endif /* LIBCLIPBOARD_BUILD_X11 */

test/test_basics.cpp

@@ -1,12 +1,14 @@
 #include <gtest/gtest.h>
 #include <libclipboard.h>
 #include <vector>
-#include <thread>
-#include <chrono>
 #include <iostream>
 
+#ifdef LIBCLIPBOARD_BUILD_X11
+#include <thread>
+#include <chrono>
 using std::this_thread::sleep_for;
 using std::chrono::milliseconds;
+#endif
 
 class BasicsTest : public ::testing::Test {
 };
@@ -16,7 +18,7 @@ TEST_F(BasicsTest, TestInstantiation) {
     ASSERT_TRUE(ret != NULL);
     clipboard_free(ret);
     // TODO(jtanx): Insert platform specific tests based on clipboard_opts
-#ifdef _WIN32
+#ifdef LIBCLIPBOARD_BUILD_WIN32
     clipboard_opts opts = {0};
     ret = clipboard_new(&opts);
     ASSERT_TRUE(ret != NULL);
@@ -63,7 +65,7 @@ TEST_F(BasicsTest, TestOwnership) {
 
     ASSERT_FALSE(clipboard_has_ownership(cb2, LC_CLIPBOARD));
     ASSERT_TRUE(clipboard_set_text_ex(cb2, "test2", -1, LC_CLIPBOARD));
-#ifdef __linux__
+#ifdef LIBCLIPBOARD_BUILD_X11
     /* Race condition on X11: SelectionClear/SelectionNotify event may come after */
     sleep_for(milliseconds(100));
 #endif
@@ -102,7 +104,7 @@ TEST_F(BasicsTest, TestSetText) {
     clipboard_c *cb2 = clipboard_new(NULL);
 
     ASSERT_TRUE(clipboard_set_text_ex(cb1, "test", -1, LC_CLIPBOARD));
-#ifdef __linux__
+#ifdef LIBCLIPBOARD_BUILD_X11
     /* Race condition on X11: SelectionClear/SelectionNotify event may come after */
     sleep_for(milliseconds(100));
 #endif
@@ -114,7 +116,7 @@ TEST_F(BasicsTest, TestSetText) {
     free(ret2);
 
     ASSERT_TRUE(clipboard_set_text_ex(cb2, "string", -1, LC_CLIPBOARD));
-#ifdef __linux__
+#ifdef LIBCLIPBOARD_BUILD_X11
     /* Race condition on X11: SelectionClear/SelectionNotify event may come after */
     sleep_for(milliseconds(100));
 #endif
@@ -126,7 +128,7 @@ TEST_F(BasicsTest, TestSetText) {
     free(ret2);
 
     ASSERT_TRUE(clipboard_set_text_ex(cb1, "test", 1, LC_CLIPBOARD));
-#ifdef __linux__
+#ifdef LIBCLIPBOARD_BUILD_X11
     /* Race condition on X11: SelectionClear/SelectionNotify event may come after */
     sleep_for(milliseconds(100));
 #endif
@@ -152,7 +154,7 @@ TEST_F(BasicsTest, TestGetText) {
     ASSERT_TRUE(clipboard_text_ex(NULL, &length, LC_SELECTION) == NULL);
 
     clipboard_set_text_ex(cb1, "test", -1, LC_CLIPBOARD);
-#ifdef __linux__
+#ifdef LIBCLIPBOARD_BUILD_X11
     /* Race condition on X11: SelectionClear/SelectionNotify event may come after */
     sleep_for(milliseconds(100));
 #endif
@@ -184,7 +186,7 @@ TEST_F(BasicsTest, TestUTF8InputOutput) {
     char *ret;
 
     ASSERT_TRUE(clipboard_set_text_ex(cb1, "\xe6\x9c\xaa\xe6\x9d\xa5", -1, LC_CLIPBOARD));
-#ifdef __linux__
+#ifdef LIBCLIPBOARD_BUILD_X11
     /* Race condition on X11: SelectionClear/SelectionNotify event may come after */
     sleep_for(milliseconds(100));
 #endif