don't use separate macos cmake.txt

ping #263
glest · Oct 17, 2018 · a7c3439 · a7c3439
1 parent dddf69b
commit a7c3439
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -54,9 +54,9 @@ IF(WANT_STATIC_LIBS AND "${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
 ENDIF()
 
 ## Compiler flags, CPACK configuration and other Apple specific code.
-IF(APPLE)
-	include(${PROJECT_SOURCE_DIR}/mk/macos/CMakeLists.txt)
-ENDIF(APPLE)
+# IF(APPLE)
+#	 include(${PROJECT_SOURCE_DIR}/mk/macos/CMakeLists.txt)
+# ENDIF(APPLE)
 
 IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
 	IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")

diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt
@@ -86,6 +86,7 @@ IF(BUILD_ZETAGLEST)
 	ENDIF()
 
 	IF(WANT_USE_OpenSSL)
+		INCLUDE_DIRECTORIES(/usr/local/opt/openssl)
 		set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)
 		include(FindOpenSSL)
 		IF(OPENSSL_FOUND)

diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt
@@ -81,6 +81,7 @@ IF(BUILD_MODEL_VIEWER OR BUILD_MAP_EDITOR OR BUILD_ZETAGLEST)
 	ENDIF()
 
 	IF(WANT_USE_OpenSSL)
+		INCLUDE_DIRECTORIES(/usr/local/opt/openssl)
 		set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)
 		include(FindOpenSSL)
 		IF(OPENSSL_FOUND)