Skip to content
Browse files

Move local directory to top-level

  • Loading branch information...
1 parent ba785bc commit 29b6d69d38a3583424e1e32aa6d4240054790c3f @nikreiman nikreiman committed Oct 25, 2012
Showing with 16 additions and 11 deletions.
  1. +1 −1 .gitignore
  2. +10 −9 CMakeLists.txt
  3. 0 {vendor → }/local/README-LOCAL.txt
  4. +3 −1 main/CMakeLists.txt
  5. +2 −0 test/CMakeLists.txt
View
2 .gitignore
@@ -1,5 +1,6 @@
# Build directories
build/*
+local/*
# Temporary files
*.swp
@@ -31,7 +32,6 @@ projects/NetBeans/MrsWatson/nbproject/private/
projects/VisualStudio/ipch/*
# Third-party libraries
-vendor/local/*
vendor/vstsdk2.4/*
# Vim helpers
View
19 CMakeLists.txt
@@ -1,13 +1,14 @@
cmake_minimum_required(VERSION 2.6)
-project(MRSWATSON)
+project(MrsWatson)
set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
-include_directories(${CMAKE_SOURCE_DIR}/source ${CMAKE_SOURCE_DIR}/vendor/local/include ${CMAKE_SOURCE_DIR}/vendor/vstsdk2.4/pluginterfaces/vst2.x)
+set(localDir ${CMAKE_SOURCE_DIR}/local)
+include_directories(${CMAKE_SOURCE_DIR}/source ${localDir}/include ${CMAKE_SOURCE_DIR}/vendor/vstsdk2.4/pluginterfaces/vst2.x)
# Third-party dependencies ###################################################
include(ExternalProject)
-set(local_INCLUDE ${CMAKE_SOURCE_DIR}/vendor/local/include)
-set(local_LIB ${CMAKE_SOURCE_DIR}/vendor/local/lib)
+set(local_INCLUDE ${localDir}/include)
+set(local_LIB ${localDir}/lib)
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(ARCH_FLAGS "-m32")
@@ -19,14 +20,14 @@ set(generic_CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> CFLA
# zlib #######################################################################
-set(libz_CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${CMAKE_SOURCE_DIR}/vendor/local --archs=${ARCH_FLAGS} --static)
+set(libz_CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=${localDir} --archs=${ARCH_FLAGS} --static)
ExternalProject_Add(libz
URL http://zlib.net/zlib-1.2.7.tar.gz
URL_MD5 60df6a37c56e7c1366cca812414f7b85
PREFIX ${CMAKE_SOURCE_DIR}/build/zlib
CONFIGURE_COMMAND ${libz_CONFIGURE_COMMAND}
- INSTALL_DIR ${CMAKE_SOURCE_DIR}/vendor/local
+ INSTALL_DIR ${localDir}
BUILD_COMMAND ${MAKE}
BUILD_IN_SOURCE 1
)
@@ -38,7 +39,7 @@ ExternalProject_Add(libiconv
URL_MD5 e34509b1623cec449dfeb73d7ce9c6c6
PREFIX ${CMAKE_SOURCE_DIR}/build/libiconv
CONFIGURE_COMMAND ${generic_CONFIGURE_COMMAND}
- INSTALL_DIR ${CMAKE_SOURCE_DIR}/vendor/local
+ INSTALL_DIR ${localDir}
BUILD_COMMAND ${MAKE}
BUILD_IN_SOURCE 1
)
@@ -49,7 +50,7 @@ ExternalProject_Add(libiconv
#ExternalProject_Add(libaudiofile
# SOURCE_DIR ${CMAKE_SOURCE_DIR}/vendor/audiofile
-# INSTALL_DIR ${CMAKE_SOURCE_DIR}/vendor/local
+# INSTALL_DIR ${localDir}
# CONFIGURE_COMMAND ${libaudiofile_CONFIGURE_COMMAND}
# PREFIX ${CMAKE_SOURCE_DIR}/build/audiofile
# TMP_DIR ${CMAKE_SOURCE_DIR}/build/audiofile/tmp
@@ -69,7 +70,7 @@ ExternalProject_Add(libarchive
URL_MD5 af443ca9a10ddbcbf00f7ae34ca7fc16
PREFIX ${CMAKE_SOURCE_DIR}/build/libarchive
CONFIGURE_COMMAND ${libarchive_CONFIGURE_COMMAND}
- INSTALL_DIR ${CMAKE_SOURCE_DIR}/vendor/local
+ INSTALL_DIR ${localDir}
BUILD_COMMAND ${MAKE}
BUILD_IN_SOURCE 1
)
View
0 vendor/local/README-LOCAL.txt → local/README-LOCAL.txt
File renamed without changes.
View
4 main/CMakeLists.txt
@@ -1,4 +1,4 @@
-link_directories(${MRSWATSON_BINARY_DIR}/source ${MRSWATSON_BINARY_DIR}/vendor/local/lib)
+link_directories(${MRSWATSON_BINARY_DIR}/source ${MRSWATSON_BINARY_DIR}/local/lib)
file(GLOB MrsWatson_SOURCES *.c)
add_executable(mrswatson ${MrsWatson_SOURCES})
@@ -12,3 +12,5 @@ else()
target_link_libraries(mrswatson ${base_libraries})
endif()
+file(COPY mrswatson DESTINATION ${MRSWATSON_BINARY_DIR}/local/bin)
+
View
2 test/CMakeLists.txt
@@ -10,3 +10,5 @@ else()
target_link_libraries(mrswatsontest MrsWatson)
endif()
+file(COPY mrswatsontest DESTINATION ${MRSWATSON_BINARY_DIR}/local/bin)
+

0 comments on commit 29b6d69

Please sign in to comment.
Something went wrong with that request. Please try again.