summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2015-10-03 06:32:00 (GMT)
committerTony Theodore <tonyt@logyst.com>2015-10-03 06:32:00 (GMT)
commita0ae5124246cfad9fc234f82248783d665c0e9dc (patch)
tree01bfde7902df9dcea3a17cc0488f8926ef901b99
parent8a2cbf2c289b46e2f3458d895f021ea79ac04d37 (diff)
downloadmxe-a0ae5124246cfad9fc234f82248783d665c0e9dc.zip
mxe-a0ae5124246cfad9fc234f82248783d665c0e9dc.tar.gz
mxe-a0ae5124246cfad9fc234f82248783d665c0e9dc.tar.bz2
move cmake modules to src/cmake/modules
-rw-r--r--src/cmake/modules/CMakeParseArguments.cmake (renamed from src/cmake/CMakeParseArguments.cmake)0
-rw-r--r--src/cmake/modules/FindFreetype.cmake (renamed from src/cmake/FindFreetype.cmake)0
-rw-r--r--src/cmake/modules/FindOpenSSL.cmake (renamed from src/cmake/FindOpenSSL.cmake)0
-rw-r--r--src/cmake/modules/FindPackageHandleStandardArgs.cmake (renamed from src/cmake/FindPackageHandleStandardArgs.cmake)0
-rw-r--r--src/cmake/modules/FindPackageMessage.cmake (renamed from src/cmake/FindPackageMessage.cmake)0
-rw-r--r--src/cmake/modules/FindSDL.cmake (renamed from src/cmake/FindSDL.cmake)0
-rw-r--r--src/cmake/modules/FindSDL_image.cmake (renamed from src/cmake/FindSDL_image.cmake)0
-rw-r--r--src/cmake/modules/FindSDL_mixer.cmake (renamed from src/cmake/FindSDL_mixer.cmake)0
-rw-r--r--src/cmake/modules/FindSDL_net.cmake (renamed from src/cmake/FindSDL_net.cmake)0
-rw-r--r--src/cmake/modules/FindSDL_sound.cmake (renamed from src/cmake/FindSDL_sound.cmake)0
-rw-r--r--src/cmake/modules/FindSDL_ttf.cmake (renamed from src/cmake/FindSDL_ttf.cmake)0
-rw-r--r--src/cmake/modules/FindTIFF.cmake (renamed from src/cmake/FindTIFF.cmake)0
-rw-r--r--src/mxe-conf.mk3
13 files changed, 1 insertions, 2 deletions
diff --git a/src/cmake/CMakeParseArguments.cmake b/src/cmake/modules/CMakeParseArguments.cmake
index 8553f38..8553f38 100644
--- a/src/cmake/CMakeParseArguments.cmake
+++ b/src/cmake/modules/CMakeParseArguments.cmake
diff --git a/src/cmake/FindFreetype.cmake b/src/cmake/modules/FindFreetype.cmake
index f1821f6..f1821f6 100644
--- a/src/cmake/FindFreetype.cmake
+++ b/src/cmake/modules/FindFreetype.cmake
diff --git a/src/cmake/FindOpenSSL.cmake b/src/cmake/modules/FindOpenSSL.cmake
index 6b4f985..6b4f985 100644
--- a/src/cmake/FindOpenSSL.cmake
+++ b/src/cmake/modules/FindOpenSSL.cmake
diff --git a/src/cmake/FindPackageHandleStandardArgs.cmake b/src/cmake/modules/FindPackageHandleStandardArgs.cmake
index 6bcf1e7..6bcf1e7 100644
--- a/src/cmake/FindPackageHandleStandardArgs.cmake
+++ b/src/cmake/modules/FindPackageHandleStandardArgs.cmake
diff --git a/src/cmake/FindPackageMessage.cmake b/src/cmake/modules/FindPackageMessage.cmake
index a0349d3..a0349d3 100644
--- a/src/cmake/FindPackageMessage.cmake
+++ b/src/cmake/modules/FindPackageMessage.cmake
diff --git a/src/cmake/FindSDL.cmake b/src/cmake/modules/FindSDL.cmake
index f426494..f426494 100644
--- a/src/cmake/FindSDL.cmake
+++ b/src/cmake/modules/FindSDL.cmake
diff --git a/src/cmake/FindSDL_image.cmake b/src/cmake/modules/FindSDL_image.cmake
index 6251d9d..6251d9d 100644
--- a/src/cmake/FindSDL_image.cmake
+++ b/src/cmake/modules/FindSDL_image.cmake
diff --git a/src/cmake/FindSDL_mixer.cmake b/src/cmake/modules/FindSDL_mixer.cmake
index 08bc886..08bc886 100644
--- a/src/cmake/FindSDL_mixer.cmake
+++ b/src/cmake/modules/FindSDL_mixer.cmake
diff --git a/src/cmake/FindSDL_net.cmake b/src/cmake/modules/FindSDL_net.cmake
index 61465e9..61465e9 100644
--- a/src/cmake/FindSDL_net.cmake
+++ b/src/cmake/modules/FindSDL_net.cmake
diff --git a/src/cmake/FindSDL_sound.cmake b/src/cmake/modules/FindSDL_sound.cmake
index 9e8fa0b..9e8fa0b 100644
--- a/src/cmake/FindSDL_sound.cmake
+++ b/src/cmake/modules/FindSDL_sound.cmake
diff --git a/src/cmake/FindSDL_ttf.cmake b/src/cmake/modules/FindSDL_ttf.cmake
index 1d2ca02..1d2ca02 100644
--- a/src/cmake/FindSDL_ttf.cmake
+++ b/src/cmake/modules/FindSDL_ttf.cmake
diff --git a/src/cmake/FindTIFF.cmake b/src/cmake/modules/FindTIFF.cmake
index 08602dd..08602dd 100644
--- a/src/cmake/FindTIFF.cmake
+++ b/src/cmake/modules/FindTIFF.cmake
diff --git a/src/mxe-conf.mk b/src/mxe-conf.mk
index d8645a6..aaf31e2 100644
--- a/src/mxe-conf.mk
+++ b/src/mxe-conf.mk
@@ -23,7 +23,6 @@ define $(PKG)_BUILD_COMMON
echo 'set(MSYS 1)'; \
echo 'set(BUILD_SHARED_LIBS $(if $(BUILD_SHARED),ON,OFF))'; \
echo 'set(LIBTYPE $(if $(BUILD_SHARED),SHARED,STATIC))'; \
- echo 'set(CMAKE_BUILD_TYPE Release)'; \
echo 'set(CMAKE_FIND_ROOT_PATH $(PREFIX)/$(TARGET))'; \
echo 'set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)'; \
echo 'set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)'; \
@@ -32,7 +31,7 @@ define $(PKG)_BUILD_COMMON
echo 'set(CMAKE_CXX_COMPILER $(PREFIX)/bin/$(TARGET)-g++)'; \
echo 'set(CMAKE_Fortran_COMPILER $(PREFIX)/bin/$(TARGET)-gfortran)'; \
echo 'set(CMAKE_RC_COMPILER $(PREFIX)/bin/$(TARGET)-windres)'; \
- echo 'set(CMAKE_MODULE_PATH "$(PWD)/src/cmake" $${CMAKE_MODULE_PATH}) # For mxe FindPackage scripts'; \
+ echo 'set(CMAKE_MODULE_PATH "$(PWD)/src/cmake/modules" $${CMAKE_MODULE_PATH}) # For mxe FindPackage scripts'; \
echo 'set(CMAKE_INSTALL_PREFIX $(PREFIX)/$(TARGET) CACHE PATH "Installation Prefix")'; \
echo 'set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug|Release|RelWithDebInfo|MinSizeRel")'; \
echo 'set(CMAKE_CROSS_COMPILING ON) # Workaround for http://www.cmake.org/Bug/view.php?id=14075'; \