Просмотр исходного кода

mono lib只需要在系统lib目录下查找即可
windows我会手动生成放到Usr/Lib下面
linux中会自动放到/usr/lib或者/usr/local/lib下面

tanghai 14 лет назад
Родитель
Сommit
d41fb6f2ed
3 измененных файлов с 7 добавлено и 12 удалено
  1. 0 3
      Cpp/CMakeLists.txt
  2. 3 5
      Cpp/Cmake/FindMono.cmake
  3. 4 4
      Cpp/Platform/Mono/CMakeLists.txt

+ 0 - 3
Cpp/CMakeLists.txt

@@ -42,9 +42,6 @@ SET(Boost_USE_STATIC_LIBS    ON)
 SET(Boost_USE_MULTITHREADED  ON)
 SET(Boost_USE_STATIC_RUNTIME OFF)
 
-GET_PROPERTY(IncludeDirs DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
-MESSAGE("IncludeDirs: ${IncludeDirs}")
-
 SET(ThirdPartyLibs
 	gtest
 	gmock

+ 3 - 5
Cpp/Cmake/FindMono.cmake

@@ -7,20 +7,18 @@ IF(WIN32)
 	SET(CMAKE_FIND_LIBRARY_PREFIXES "lib" "")
 	SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" "")
 	FIND_LIBRARY(MONO_LIBRARY NAMES mono-2.0 DOC "The Mono Library")
-	FIND_PATH(MONO_LIBRARY_DIR mono-2.0.lib)
 ELSEIF(UNIX)
 	FIND_PACKAGE(PkgConfig REQUIRED)
 	PKG_SEARCH_MODULE(MONO mono-2 REQUIRED QUIET)
 	FIND_PATH(MONO_INCLUDE_DIR mono/jit/jit.h HINTS ${MONO_INCLUDE_DIR} ${MONO_INCLUDE_DIRS})
-	FIND_LIBRARY(MONO_LIBRARY NAMES mono-2.0 HINTS ${MONO_LIBRARY_DIRS})
+	FIND_LIBRARY(MONO_LIBRARY NAMES mono-2.0)
 ENDIF()
 
 SET(MONO_INCLUDE_DIRS ${MONO_INCLUDE_DIR})
 SET(MONO_LIBRARIES ${MONO_LIBRARY})
-SET(MONO_LIBRARY_DIRS ${MONO_LIBRARY_DIR})
 
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(MONO DEFAULT_MSG
-		MONO_EXECUTABLE MONO_GMCS_EXECUTABLE MONO_GACUTIL_EXECUTABLE MONO_INCLUDE_DIR MONO_LIBRARY MONO_LIBRARY_DIR)
+		MONO_EXECUTABLE MONO_GMCS_EXECUTABLE MONO_GACUTIL_EXECUTABLE MONO_INCLUDE_DIR MONO_LIBRARY)
 
-MARK_AS_ADVANCED(MONO_EXECUTABLE MONO_GMCS_EXECUTABLE MONO_GACUTIL_EXECUTABLE MONO_INCLUDE_DIR MONO_LIBRARY MONO_LIBRARY_DIR)
+MARK_AS_ADVANCED(MONO_EXECUTABLE MONO_GMCS_EXECUTABLE MONO_GACUTIL_EXECUTABLE MONO_INCLUDE_DIR MONO_LIBRARY)

+ 4 - 4
Cpp/Platform/Mono/CMakeLists.txt

@@ -22,12 +22,12 @@ ADD_CUSTOM_COMMAND(
 	DEPENDS ${MonoCsharpSrc}
 )
 
-ADD_CUSTOM_TARGET(MonoInitTestAssembly
+ADD_CUSTOM_TARGET(MonoInitTestAssembly ALL
 	DEPENDS MonoInit.exe
 )
+SET_PROPERTY(TARGET MonoInitTestAssembly PROPERTY FOLDER "Tests/Platform/Mono")
 
 INCLUDE_DIRECTORIES(${MONO_INCLUDE_DIRS})
-LINK_DIRECTORIES(${MONO_LIBRARY_DIRS})
 
 ADD_EXECUTABLE(MonoInitTest MonoInitTest.cc)
 
@@ -39,8 +39,8 @@ SET(Tests
 
 FOREACH(Test ${Tests})
 	TARGET_LINK_LIBRARIES(${Test}
-		${Mono} 
-		${MONO_LIBRARIES} 
+		${Mono}
+		${MONO_LIBRARIES}
 		${ThirdPartyLibs}
 	)
 	ADD_TEST(${Test} ${Test})